diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 07:52:47 +0200 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 07:52:47 +0200 |
commit | 23930fa1cebfea6f79881c588ccd1b0781e49e3f (patch) | |
tree | 36d29e3f83661c4f5f45b6f74ac0d5f9886867a8 /mm/page_alloc.c | |
parent | [libata] Delete pata_it8172 driver (diff) | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 (diff) | |
download | linux-23930fa1cebfea6f79881c588ccd1b0781e49e3f.tar.xz linux-23930fa1cebfea6f79881c588ccd1b0781e49e3f.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 54a4f5375bba..3b5358a0561f 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2363,7 +2363,7 @@ int percpu_pagelist_fraction_sysctl_handler(ctl_table *table, int write, return 0; } -__initdata int hashdist = HASHDIST_DEFAULT; +int hashdist = HASHDIST_DEFAULT; #ifdef CONFIG_NUMA static int __init set_hashdist(char *str) |