Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 04903664325acb3f199dd8a4b8f1aa437e9fd6b2

Authored by Andrew Morton
Committed by Linus Torvalds
1 parent 93f210dd9e
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] remove HASH_HIGHMEM 

It has no users and it's doubtful that we'll need it again.

Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 2 changed files with 2 additions and 3 deletions Side-by-side Diff

include/linux/bootmem.h
Diff comments   View file @ 0490366
... ... @@ -119,8 +119,7 @@
119 119 unsigned int *_hash_mask,
120 120 unsigned long limit);
121 121  
122   -#define HASH_HIGHMEM 0x00000001 /* Consider highmem? */
123   -#define HASH_EARLY 0x00000002 /* Allocating during early boot? */
  122 +#define HASH_EARLY 0x00000001 /* Allocating during early boot? */
124 123  
125 124 /* Only NUMA needs hash distribution.
126 125 * IA64 is known to have sufficient vmalloc space.
... ... @@ -3226,7 +3226,7 @@
3226 3226 /* allow the kernel cmdline to have a say */
3227 3227 if (!numentries) {
3228 3228 /* round applicable memory size up to nearest megabyte */
3229   - numentries = (flags & HASH_HIGHMEM) ? nr_all_pages : nr_kernel_pages;
  3229 + numentries = nr_kernel_pages;
3230 3230 numentries += (1UL << (20 - PAGE_SHIFT)) - 1;
3231 3231 numentries >>= 20 - PAGE_SHIFT;
3232 3232 numentries <<= 20 - PAGE_SHIFT;