diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
| commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
| tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /include/asm-mips/pgtable-32.h | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
| parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
Diffstat (limited to 'include/asm-mips/pgtable-32.h')
| -rw-r--r-- | include/asm-mips/pgtable-32.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-mips/pgtable-32.h b/include/asm-mips/pgtable-32.h index a0947092d0e0..ceefe027c761 100644 --- a/include/asm-mips/pgtable-32.h +++ b/include/asm-mips/pgtable-32.h | |||
| @@ -65,6 +65,8 @@ extern int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1, | |||
| 65 | 65 | ||
| 66 | #define VMALLOC_START MAP_BASE | 66 | #define VMALLOC_START MAP_BASE |
| 67 | 67 | ||
| 68 | #define PKMAP_BASE (0xfe000000UL) | ||
| 69 | |||
| 68 | #ifdef CONFIG_HIGHMEM | 70 | #ifdef CONFIG_HIGHMEM |
| 69 | # define VMALLOC_END (PKMAP_BASE-2*PAGE_SIZE) | 71 | # define VMALLOC_END (PKMAP_BASE-2*PAGE_SIZE) |
| 70 | #else | 72 | #else |