staging: lustre: include linux/highmem.h when needed
PATCH 1/1 staging: lustre: include linux/highmem.h when needed
Something in recent linux-next kernels caused linux/highmem.h to no longer be included implicitly from o2iblnd_cb.c, causing a build failure:
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c: In function 'kiblnd_kvaddr_to_page':drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c:549:15: error: 'PKMAP_BASE' undeclared (first use in this function); did you mean 'RTM_BASE'?
if (vaddr >= PKMAP_BASE &&
^~~~~~~~~~
RTM_BASE
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c:549:15: note: each undeclared identifier is reported only once for each function it appears in
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c:550:28: error: 'LAST_PKMAP' undeclared (first use in this function); did you mean 'AT_HWCAP'?
vaddr < (PKMAP_BASE + LAST_PKMAP * PAGE_SIZE)) {
^~~~~~~~~~
AT_HWCAPThis adds back an explicit include for the header.
--- drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 1 + 1 file changed, 1 insertion(+)
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c +1 -0
@@ -35,6 +35,7 @@* Author: Eric Barton <[email protected]> */ +#include <linux/highmem.h> #include "o2iblnd.h" #define MAX_CONN_RACES_BEFORE_ABORT 20
Signature · 1 line
2.9.0
Quoted 15 lines · Arnd Bergmann
Something in recent linux-next kernels caused
linux/highmem.hto no longer be included implicitly fromo2iblnd_cb.c, causing a build failure:
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c: In function 'kiblnd_kvaddr_to_page':drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c:549:15: error: 'PKMAP_BASE' undeclared (first use in this function); did you mean 'RTM_BASE'?
if (vaddr >=PKMAP_BASE&&^~~~~~~~~~ RTM_BASE drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c:549:15: note: each undeclared identifier is reported only once for each function it appears in drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c:550:28: error: 'LAST_PKMAP' undeclared (first use in this function); did you mean 'AT_HWCAP'? vaddr < (PKMAP_BASE + LAST_PKMAP * PAGE_SIZE)) { ^~~~~~~~~~ AT_HWCAP
Quoted 3 lines
This adds back an explicit include for the header.
Signed-off-by Arnd Bergmann <[email protected]>
Thanks for finding and fixing this. I did recently reduce the number of include files that were automatically included everywhere. Clearly some config combinations didn't get tested properly.
Thanks,
NeilBrown
Quoted 18 lines
--- drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 1 + 1 file changed, 1 insertion(+)drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c +1
-0@@ -35,6 +35,7 @@* Author: Eric Barton <[email protected]> */ +#include <linux/highmem.h> #include "o2iblnd.h" #define MAX_CONN_RACES_BEFORE_ABORT 20Signature · 1 line
2.9.0
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 832 bytes
Desc: not available
URL: <http://lists.lustre.org/pipermail/lustre-devel-lustre.org/attachments/20180531/474c0ec7/attachment.sig>