>=linux-4.1: build fails w/_PAGE_GLOBAL_SHIFT redefined errors in pgtable-bits.h

[Mike Frysinger <vapier@gentoo.org>]

[-- Attachment #1.1: Type: text/plain, Size: 979 bytes --]

this works in linux-4.0, but starting with 4.1, i'm seeing:
  CC      arch/mips/kernel/cpu-probe.o
In file included from ./arch/mips/include/asm/io.h:27:0,
                 from ./arch/mips/include/asm/page.h:176,
                 from include/linux/mm_types.h:15,
                 from include/linux/sched.h:27,
                 from include/linux/ptrace.h:5,
                 from arch/mips/kernel/cpu-probe.c:16:
./arch/mips/include/asm/pgtable-bits.h:164:0: error: "_PAGE_GLOBAL_SHIFT" redefined [-Werror]
./arch/mips/include/asm/pgtable-bits.h:141:0: note: this is the location of the previous definition
cc1: all warnings being treated as errors
make[2]: *** [arch/mips/kernel/cpu-probe.o] Error 1
make[1]: *** [arch/mips/kernel] Error 2
make: *** [arch/mips] Error 2

this warning hits many times, but this one is actually fatal

looks like it's due to:
	be0c37c985eddc46d0d67543898c086f60460e2e MIPS: Rearrange PTE bits into fixed positions.

my config is attached
-mike

[-- Attachment #1.2: config.gz --]
[-- Type: application/octet-stream, Size: 19001 bytes --]

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]