mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 04:31:50 +00:00
6cb67bea94
Prevent the use of page table macros and types from 2 conflicting
places. This fixes multiple build errors and warnings, e.g.:
../arch/x86/include/asm/pgtable_64_types.h:21:34: error: conflicting types for ‘pte_t’
typedef struct { pteval_t pte; } pte_t;
^~~~~
In file included from ../include/linux/mm_types_task.h:16:0,
from ../include/linux/mm_types.h:5,
from ../include/linux/buildid.h:5,
from ../include/linux/module.h:14,
from ../drivers/media/pci/ivtv/ivtv-driver.h:40,
from ../drivers/media/pci/ivtv/ivtvfb.c:29:
../arch/um/include/asm/page.h:57:39: note: previous declaration of ‘pte_t’ was here
typedef struct { unsigned long pte; } pte_t;
../arch/x86/include/asm/pgtable_types.h:284:43: error: expected ‘)’ before ‘prot’
static inline pgprot_t pgprot_nx(pgprot_t prot)
^
../include/linux/pgtable.h:914:26: note: in definition of macro ‘pgprot_nx’
#define pgprot_nx(prot) (prot)
^~~~
In file included from ../arch/x86/include/asm/memtype.h:6:0,
from ../drivers/media/pci/ivtv/ivtvfb.c:40:
../arch/x86/include/asm/pgtable_types.h:288:0: warning: "pgprot_nx" redefined
#define pgprot_nx pgprot_nx
../arch/x86/include/asm/page_types.h:11:0: warning: "PAGE_SIZE" redefined
#define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT)
In file included from ../include/linux/mm_types_task.h:16:0,
from ../include/linux/mm_types.h:5,
from ../include/linux/buildid.h:5,
from ../include/linux/module.h:14,
from ../drivers/media/pci/ivtv/ivtv-driver.h:40,
from ../drivers/media/pci/ivtv/ivtvfb.c:29:
../arch/um/include/asm/page.h:14:0: note: this is the location of the previous definition
#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
Fixes:
|
||
|---|---|---|
| .. | ||
| b2c2 | ||
| bt8xx | ||
| cobalt | ||
| cx18 | ||
| cx88 | ||
| cx23885 | ||
| cx25821 | ||
| ddbridge | ||
| dm1105 | ||
| dt3155 | ||
| intel | ||
| ivtv | ||
| mantis | ||
| meye | ||
| netup_unidvb | ||
| ngene | ||
| pluto2 | ||
| pt1 | ||
| pt3 | ||
| saa7134 | ||
| saa7146 | ||
| saa7164 | ||
| smipcie | ||
| solo6x10 | ||
| sta2x11 | ||
| ttpci | ||
| tw68 | ||
| tw686x | ||
| tw5864 | ||
| Kconfig | ||
| Makefile | ||