| Message ID | 20170324132127.3199892-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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
> > 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
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, };
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(-)