tree 572661a1ed6cceaf83cad55921b7812feace69ee parent cdfb82fff33cf3b1a367a427e5d89a012dc568b1 author Hugh Dickins <[EMAIL PROTECTED]> Wed, 20 Apr 2005 03:29:23 -0700 committer Linus Torvalds <[EMAIL PROTECTED](none)> Wed, 20 Apr 2005 03:29:23 -0700
[PATCH] freepgt: arch FIRST_USER_ADDRESS 0 Replace misleading definition of FIRST_USER_PGD_NR 0 by definition of FIRST_USER_ADDRESS 0 in all the MMU architectures beyond arm and arm26. Signed-off-by: Hugh Dickins <[EMAIL PROTECTED]> Signed-off-by: Andrew Morton <[EMAIL PROTECTED]> Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]> asm-alpha/pgtable.h | 2 +- asm-cris/pgtable.h | 2 +- asm-frv/pgtable.h | 2 +- asm-i386/pgtable.h | 2 +- asm-ia64/pgtable.h | 2 +- asm-m32r/pgtable.h | 2 +- asm-m68k/pgtable.h | 2 +- asm-mips/pgtable-32.h | 2 +- asm-mips/pgtable-64.h | 2 +- asm-parisc/pgtable.h | 2 +- asm-ppc/pgtable.h | 2 +- asm-ppc64/pgtable.h | 2 +- asm-s390/pgtable.h | 4 ++-- asm-sh/pgtable.h | 2 +- asm-sh64/pgtable.h | 2 +- asm-sparc/pgtable.h | 2 +- asm-sparc64/pgtable.h | 2 +- asm-um/pgtable-2level.h | 2 +- asm-um/pgtable-3level.h | 2 +- asm-x86_64/pgtable.h | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) Index: include/asm-alpha/pgtable.h =================================================================== --- e06fe6c70972feac1c0ba1f6451c9b3d825c84c9/include/asm-alpha/pgtable.h (mode:100644 sha1:faae196d83773e2fee8e5f7d77c8f38363cd045b) +++ 572661a1ed6cceaf83cad55921b7812feace69ee/include/asm-alpha/pgtable.h (mode:100644 sha1:408aea55e0ccbc6f246c2910c6b0407a48dbcaea) @@ -42,7 +42,7 @@ #define PTRS_PER_PMD (1UL << (PAGE_SHIFT-3)) #define PTRS_PER_PGD (1UL << (PAGE_SHIFT-3)) #define USER_PTRS_PER_PGD (TASK_SIZE / PGDIR_SIZE) -#define FIRST_USER_PGD_NR 0 +#define FIRST_USER_ADDRESS 0 /* Number of pointers that fit on a page: this will go away. */ #define PTRS_PER_PAGE (1UL << (PAGE_SHIFT-3)) Index: include/asm-cris/pgtable.h =================================================================== --- e06fe6c70972feac1c0ba1f6451c9b3d825c84c9/include/asm-cris/pgtable.h (mode:100644 sha1:957dd92d108dd7127381ee4ca3ac0681a08e32ba) +++ 572661a1ed6cceaf83cad55921b7812feace69ee/include/asm-cris/pgtable.h (mode:100644 sha1:f7042944b0735578897508eac63757b3aa4a413c) @@ -76,7 +76,7 @@ */ #define USER_PTRS_PER_PGD (TASK_SIZE/PGDIR_SIZE) -#define FIRST_USER_PGD_NR 0 +#define FIRST_USER_ADDRESS 0 /* zero page used for uninitialized stuff */ #ifndef __ASSEMBLY__ Index: include/asm-frv/pgtable.h =================================================================== --- e06fe6c70972feac1c0ba1f6451c9b3d825c84c9/include/asm-frv/pgtable.h (mode:100644 sha1:cc1373c4b7906f88096b3809492247fb019d7bdd) +++ 572661a1ed6cceaf83cad55921b7812feace69ee/include/asm-frv/pgtable.h (mode:100644 sha1:3c6d42a22dfe8259dde7e9ef7ceebbf976ec0dd9) @@ -141,7 +141,7 @@ #define PTRS_PER_PTE 4096 #define USER_PGDS_IN_LAST_PML4 (TASK_SIZE / PGDIR_SIZE) -#define FIRST_USER_PGD_NR 0 +#define FIRST_USER_ADDRESS 0 #define USER_PGD_PTRS (PAGE_OFFSET >> PGDIR_SHIFT) #define KERNEL_PGD_PTRS (PTRS_PER_PGD - USER_PGD_PTRS) Index: include/asm-i386/pgtable.h =================================================================== --- e06fe6c70972feac1c0ba1f6451c9b3d825c84c9/include/asm-i386/pgtable.h (mode:100644 sha1:488c2b4befa57bac16c0b48bd03f9d39204a6e31) +++ 572661a1ed6cceaf83cad55921b7812feace69ee/include/asm-i386/pgtable.h (mode:100644 sha1:5c725425d863f0e811542680890a6cd2575d9a89) @@ -60,7 +60,7 @@ #define PGDIR_MASK (~(PGDIR_SIZE-1)) #define USER_PTRS_PER_PGD (TASK_SIZE/PGDIR_SIZE) -#define FIRST_USER_PGD_NR 0 +#define FIRST_USER_ADDRESS 0 #define USER_PGD_PTRS (PAGE_OFFSET >> PGDIR_SHIFT) #define KERNEL_PGD_PTRS (PTRS_PER_PGD-USER_PGD_PTRS) Index: include/asm-ia64/pgtable.h =================================================================== --- e06fe6c70972feac1c0ba1f6451c9b3d825c84c9/include/asm-ia64/pgtable.h (mode:100644 sha1:fecfd0f68961554360d89d379cc008e886bbbb7a) +++ 572661a1ed6cceaf83cad55921b7812feace69ee/include/asm-ia64/pgtable.h (mode:100644 sha1:ea121a002309176cd50055c6fcd497be1d1b2d94) @@ -93,7 +93,7 @@ #define PGDIR_MASK (~(PGDIR_SIZE-1)) #define PTRS_PER_PGD (1UL << (PAGE_SHIFT-3)) #define USER_PTRS_PER_PGD (5*PTRS_PER_PGD/8) /* regions 0-4 are user regions */ -#define FIRST_USER_PGD_NR 0 +#define FIRST_USER_ADDRESS 0 /* * Definitions for second level: Index: include/asm-m32r/pgtable.h =================================================================== --- e06fe6c70972feac1c0ba1f6451c9b3d825c84c9/include/asm-m32r/pgtable.h (mode:100644 sha1:70a0eb68fdf6c34f0ea223c1f601bb5184070fa5) +++ 572661a1ed6cceaf83cad55921b7812feace69ee/include/asm-m32r/pgtable.h (mode:100644 sha1:da805e970844a1d9dab8210062e8c67cb5ac8805) @@ -51,7 +51,7 @@ #define PGDIR_MASK (~(PGDIR_SIZE - 1)) #define USER_PTRS_PER_PGD (TASK_SIZE / PGDIR_SIZE) -#define FIRST_USER_PGD_NR 0 +#define FIRST_USER_ADDRESS 0 #ifndef __ASSEMBLY__ /* Just any arbitrary offset to the start of the vmalloc VM area: the Index: include/asm-m68k/pgtable.h =================================================================== --- e06fe6c70972feac1c0ba1f6451c9b3d825c84c9/include/asm-m68k/pgtable.h (mode:100644 sha1:0eef32778df25e261337d26e6a56df17834be026) +++ 572661a1ed6cceaf83cad55921b7812feace69ee/include/asm-m68k/pgtable.h (mode:100644 sha1:0c87fc84f7a4ee20b44453202d430e2428e3db16) @@ -61,7 +61,7 @@ #define PTRS_PER_PGD 128 #endif #define USER_PTRS_PER_PGD (TASK_SIZE/PGDIR_SIZE) -#define FIRST_USER_PGD_NR 0 +#define FIRST_USER_ADDRESS 0 /* Virtual address region for use by kernel_map() */ #ifdef CONFIG_SUN3 Index: include/asm-mips/pgtable-32.h =================================================================== --- e06fe6c70972feac1c0ba1f6451c9b3d825c84c9/include/asm-mips/pgtable-32.h (mode:100644 sha1:41a0df7d77685fa297417acc0581cc27c1800895) +++ 572661a1ed6cceaf83cad55921b7812feace69ee/include/asm-mips/pgtable-32.h (mode:100644 sha1:7fec93b76da9e4429cf3be4bb8ebe076ff755e69) @@ -74,7 +74,7 @@ #define PTRS_PER_PTE ((PAGE_SIZE << PTE_ORDER) / sizeof(pte_t)) #define USER_PTRS_PER_PGD (0x80000000UL/PGDIR_SIZE) -#define FIRST_USER_PGD_NR 0 +#define FIRST_USER_ADDRESS 0 #define VMALLOC_START KSEG2 Index: include/asm-mips/pgtable-64.h =================================================================== --- e06fe6c70972feac1c0ba1f6451c9b3d825c84c9/include/asm-mips/pgtable-64.h (mode:100644 sha1:704b551f59e9f93198826f76dbf65f80087eb85b) +++ 572661a1ed6cceaf83cad55921b7812feace69ee/include/asm-mips/pgtable-64.h (mode:100644 sha1:1011e0635f5693938ce12e8a7350f00d0a05ce02) @@ -89,7 +89,7 @@ #define PTRS_PER_PTE ((PAGE_SIZE << PTE_ORDER) / sizeof(pte_t)) #define USER_PTRS_PER_PGD (TASK_SIZE / PGDIR_SIZE) -#define FIRST_USER_PGD_NR 0 +#define FIRST_USER_ADDRESS 0 #define VMALLOC_START XKSEG #define VMALLOC_END \ Index: include/asm-parisc/pgtable.h =================================================================== --- e06fe6c70972feac1c0ba1f6451c9b3d825c84c9/include/asm-parisc/pgtable.h (mode:100644 sha1:af353a9bce211ad5465501c343dfca007f9f173c) +++ 572661a1ed6cceaf83cad55921b7812feace69ee/include/asm-parisc/pgtable.h (mode:100644 sha1:f001bb01e38f277a3210a7a19ee08d4bf1aabfca) @@ -120,7 +120,7 @@ * pgd entries used up by user/kernel: */ -#define FIRST_USER_PGD_NR 0 +#define FIRST_USER_ADDRESS 0 #ifndef __ASSEMBLY__ extern void *vmalloc_start; Index: include/asm-ppc/pgtable.h =================================================================== --- e06fe6c70972feac1c0ba1f6451c9b3d825c84c9/include/asm-ppc/pgtable.h (mode:100644 sha1:a67bd512b2c851cc399ca6cb76bb5f7c71b07245) +++ 572661a1ed6cceaf83cad55921b7812feace69ee/include/asm-ppc/pgtable.h (mode:100644 sha1:a38606d15549ac326babf08d583972a4be973d07) @@ -96,7 +96,7 @@ #define PTRS_PER_PGD (1 << (32 - PGDIR_SHIFT)) #define USER_PTRS_PER_PGD (TASK_SIZE / PGDIR_SIZE) -#define FIRST_USER_PGD_NR 0 +#define FIRST_USER_ADDRESS 0 #define USER_PGD_PTRS (PAGE_OFFSET >> PGDIR_SHIFT) #define KERNEL_PGD_PTRS (PTRS_PER_PGD-USER_PGD_PTRS) Index: include/asm-ppc64/pgtable.h =================================================================== --- e06fe6c70972feac1c0ba1f6451c9b3d825c84c9/include/asm-ppc64/pgtable.h (mode:100644 sha1:33b90e2aa47d88074ea8d32bbd2d4872642aa783) +++ 572661a1ed6cceaf83cad55921b7812feace69ee/include/asm-ppc64/pgtable.h (mode:100644 sha1:a26120517c542acdcf3766a9d9aa5aa79d381e5f) @@ -41,7 +41,7 @@ #define PTRS_PER_PGD (1 << PGD_INDEX_SIZE) #define USER_PTRS_PER_PGD (1024) -#define FIRST_USER_PGD_NR 0 +#define FIRST_USER_ADDRESS 0 #define EADDR_SIZE (PTE_INDEX_SIZE + PMD_INDEX_SIZE + \ PGD_INDEX_SIZE + PAGE_SHIFT) Index: include/asm-s390/pgtable.h =================================================================== --- e06fe6c70972feac1c0ba1f6451c9b3d825c84c9/include/asm-s390/pgtable.h (mode:100644 sha1:1633cb75f05779a3aa07bd5180edcd0709025b11) +++ 572661a1ed6cceaf83cad55921b7812feace69ee/include/asm-s390/pgtable.h (mode:100644 sha1:df94f89038cc3ab5f93d3f6db8df742b1f24c720) @@ -95,14 +95,14 @@ # define USER_PTRS_PER_PGD 512 # define USER_PGD_PTRS 512 # define KERNEL_PGD_PTRS 512 -# define FIRST_USER_PGD_NR 0 #else /* __s390x__ */ # define USER_PTRS_PER_PGD 2048 # define USER_PGD_PTRS 2048 # define KERNEL_PGD_PTRS 2048 -# define FIRST_USER_PGD_NR 0 #endif /* __s390x__ */ +#define FIRST_USER_ADDRESS 0 + #define pte_ERROR(e) \ printk("%s:%d: bad pte %p.\n", __FILE__, __LINE__, (void *) pte_val(e)) #define pmd_ERROR(e) \ Index: include/asm-sh/pgtable.h =================================================================== --- e06fe6c70972feac1c0ba1f6451c9b3d825c84c9/include/asm-sh/pgtable.h (mode:100644 sha1:8a9689d5366f64b60e8d03c9c4dc3b72d38a6de0) +++ 572661a1ed6cceaf83cad55921b7812feace69ee/include/asm-sh/pgtable.h (mode:100644 sha1:cd847a47a9aa1a681d8f44cf250d9e12f8341ea3) @@ -44,7 +44,7 @@ #define PGDIR_MASK (~(PGDIR_SIZE-1)) #define USER_PTRS_PER_PGD (TASK_SIZE/PGDIR_SIZE) -#define FIRST_USER_PGD_NR 0 +#define FIRST_USER_ADDRESS 0 #define PTE_PHYS_MASK 0x1ffff000 Index: include/asm-sh64/pgtable.h =================================================================== --- e06fe6c70972feac1c0ba1f6451c9b3d825c84c9/include/asm-sh64/pgtable.h (mode:100644 sha1:45f70c0f4a5e649b06043ee6d46034d19e7b8a29) +++ 572661a1ed6cceaf83cad55921b7812feace69ee/include/asm-sh64/pgtable.h (mode:100644 sha1:525e1523ef5f229b49d61e413e0aa2561e4a7383) @@ -238,7 +238,7 @@ /* Round it up ! */ #define USER_PTRS_PER_PGD ((TASK_SIZE+PGDIR_SIZE-1)/PGDIR_SIZE) -#define FIRST_USER_PGD_NR 0 +#define FIRST_USER_ADDRESS 0 #ifndef __ASSEMBLY__ #define VMALLOC_END 0xff000000 Index: include/asm-sparc/pgtable.h =================================================================== --- e06fe6c70972feac1c0ba1f6451c9b3d825c84c9/include/asm-sparc/pgtable.h (mode:100644 sha1:373a6c327590d84e4e7cbcf2f0116982cbd44807) +++ 572661a1ed6cceaf83cad55921b7812feace69ee/include/asm-sparc/pgtable.h (mode:100644 sha1:40ed30a2b7c6f9f876d4c9a5de094bfdf6bef093) @@ -63,7 +63,7 @@ #define PTRS_PER_PMD BTFIXUP_SIMM13(ptrs_per_pmd) #define PTRS_PER_PGD BTFIXUP_SIMM13(ptrs_per_pgd) #define USER_PTRS_PER_PGD BTFIXUP_SIMM13(user_ptrs_per_pgd) -#define FIRST_USER_PGD_NR 0 +#define FIRST_USER_ADDRESS 0 #define PTE_SIZE (PTRS_PER_PTE*4) #define PAGE_NONE __pgprot(BTFIXUP_INT(page_none)) Index: include/asm-sparc64/pgtable.h =================================================================== --- e06fe6c70972feac1c0ba1f6451c9b3d825c84c9/include/asm-sparc64/pgtable.h (mode:100644 sha1:c93011574843b49626b572b2979a4d19e2052653) +++ 572661a1ed6cceaf83cad55921b7812feace69ee/include/asm-sparc64/pgtable.h (mode:100644 sha1:af9bf175a223cf44310293287d50302e0fd3f9e9) @@ -78,7 +78,7 @@ #define PTRS_PER_PGD (1UL << PGDIR_BITS) /* Kernel has a separate 44bit address space. */ -#define FIRST_USER_PGD_NR 0 +#define FIRST_USER_ADDRESS 0 #define pte_ERROR(e) __builtin_trap() #define pmd_ERROR(e) __builtin_trap() Index: include/asm-um/pgtable-2level.h =================================================================== --- e06fe6c70972feac1c0ba1f6451c9b3d825c84c9/include/asm-um/pgtable-2level.h (mode:100644 sha1:61eb247342475c123f09d18467502403f0055dc7) +++ 572661a1ed6cceaf83cad55921b7812feace69ee/include/asm-um/pgtable-2level.h (mode:100644 sha1:9b3abc01d60e108e1304453f6c2205e90ec16d1d) @@ -23,7 +23,7 @@ #define PTRS_PER_PTE 1024 #define USER_PTRS_PER_PGD ((TASK_SIZE + (PGDIR_SIZE - 1)) / PGDIR_SIZE) #define PTRS_PER_PGD 1024 -#define FIRST_USER_PGD_NR 0 +#define FIRST_USER_ADDRESS 0 #define pte_ERROR(e) \ printk("%s:%d: bad pte %p(%08lx).\n", __FILE__, __LINE__, &(e), \ Index: include/asm-um/pgtable-3level.h =================================================================== --- e06fe6c70972feac1c0ba1f6451c9b3d825c84c9/include/asm-um/pgtable-3level.h (mode:100644 sha1:faf051c2c418935692c6e3223aad646b89954498) +++ 572661a1ed6cceaf83cad55921b7812feace69ee/include/asm-um/pgtable-3level.h (mode:100644 sha1:bdbc3f97e20be29a732cc115d73a68a53f481827) @@ -31,7 +31,7 @@ #define PTRS_PER_PMD 512 #define USER_PTRS_PER_PGD ((TASK_SIZE + (PGDIR_SIZE - 1)) / PGDIR_SIZE) #define PTRS_PER_PGD 512 -#define FIRST_USER_PGD_NR 0 +#define FIRST_USER_ADDRESS 0 #define pte_ERROR(e) \ printk("%s:%d: bad pte %p(%016lx).\n", __FILE__, __LINE__, &(e), \ Index: include/asm-x86_64/pgtable.h =================================================================== --- e06fe6c70972feac1c0ba1f6451c9b3d825c84c9/include/asm-x86_64/pgtable.h (mode:100644 sha1:dc6b6f2604e80419a477f4512d74c8ccd13516ba) +++ 572661a1ed6cceaf83cad55921b7812feace69ee/include/asm-x86_64/pgtable.h (mode:100644 sha1:db2a0efbf5738b8294153713e862183512acdfc1) @@ -114,7 +114,7 @@ #define PGDIR_MASK (~(PGDIR_SIZE-1)) #define USER_PTRS_PER_PGD (TASK_SIZE/PGDIR_SIZE) -#define FIRST_USER_PGD_NR 0 +#define FIRST_USER_ADDRESS 0 #ifndef __ASSEMBLY__ #define MAXMEM 0x3fffffffffffUL - To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html