Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1608393 > unrolled thread
| Started by | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| First post | 2017-03-24 14:30 +0100 |
| Last post | 2017-03-27 17:20 +0200 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] staging: media: atomisp: remove ifdef around HMM_BO_ION Arnd Bergmann <arnd@arndb.de> - 2017-03-24 14:30 +0100
Re: [PATCH] staging: media: atomisp: remove ifdef around HMM_BO_ION Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-03-24 14:50 +0100
Re: [PATCH] staging: media: atomisp: remove ifdef around HMM_BO_ION Alan Cox <alan@linux.intel.com> - 2017-03-27 17:20 +0200
| From | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| Date | 2017-03-24 14:30 +0100 |
| Subject | [PATCH] staging: media: atomisp: remove ifdef around HMM_BO_ION |
| Message-ID | <toxrX-279-1@gated-at.bofh.it> |
The revert reintroduced a build failure without CONFIG_ION:
media/atomisp/pci/atomisp2/hmm/hmm.c:52:2: error: excess elements in array initializer [-Werror]
media/atomisp/pci/atomisp2/hmm/hmm.c:52:2: note: (near initialization for 'hmm_bo_type_strings')
We should really be able to build in any configuration, so this tries a
different fix to make sure the symbol is defined.
Fixes: 9ca98bd07748 ("Revert "staging: media: atomisp: fill properly hmm_bo_type_strings when ION is disabled"")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_bo.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_bo.h b/drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_bo.h
index dffd6e9cf693..513d06dff043 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_bo.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_bo.h
@@ -81,9 +81,7 @@ enum hmm_bo_type {
HMM_BO_PRIVATE,
HMM_BO_SHARE,
HMM_BO_USER,
-#ifdef CONFIG_ION
HMM_BO_ION,
-#endif
HMM_BO_LAST,
};
--
2.9.0
[toc] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2017-03-24 14:50 +0100 |
| Message-ID | <toxLj-2hq-11@gated-at.bofh.it> |
| In reply to | #1608393 |
On Fri, Mar 24, 2017 at 02:20:24PM +0100, Arnd Bergmann wrote:
> The revert reintroduced a build failure without CONFIG_ION:
>
> media/atomisp/pci/atomisp2/hmm/hmm.c:52:2: error: excess elements in array initializer [-Werror]
> media/atomisp/pci/atomisp2/hmm/hmm.c:52:2: note: (near initialization for 'hmm_bo_type_strings')
>
> We should really be able to build in any configuration, so this tries a
> different fix to make sure the symbol is defined.
>
> Fixes: 9ca98bd07748 ("Revert "staging: media: atomisp: fill properly hmm_bo_type_strings when ION is disabled"")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_bo.h | 2 --
> 1 file changed, 2 deletions(-)
Ugh, Alan, what's going on here, I thought you fixed this?
totally confused,
greg k-h
[toc] | [prev] | [next] | [standalone]
| From | Alan Cox <alan@linux.intel.com> |
|---|---|
| Date | 2017-03-27 17:20 +0200 |
| Message-ID | <tpEB4-1AA-21@gated-at.bofh.it> |
| In reply to | #1608400 |
> > 2 -- > > 1 file changed, 2 deletions(-) > > Ugh, Alan, what's going on here, I thought you fixed this? I sent you a patch that removed the arrays entirely and turned it into a single string as well as removing the define. Not quite sure what happened but I've resynched to -next and I'll send you it with the next batch of patches. Alan
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web