diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-04-02 10:20:05 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-04-02 10:20:05 +0200 |
| commit | ac4d7f0bed9b03204539de81c8b62b35c9f4e16a (patch) | |
| tree | 6afd6fa0580f6a6f316788222b026f86b83647ac /init | |
| parent | 1630ae851f808a7fe563ed8e988a42d3326bd75a (diff) | |
| parent | 19f00f070c17584b5acaf186baf4d12a7d2ed125 (diff) | |
| download | lwn-ac4d7f0bed9b03204539de81c8b62b35c9f4e16a.tar.gz lwn-ac4d7f0bed9b03204539de81c8b62b35c9f4e16a.zip | |
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.33.y
Conflicts:
Makefile
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index 48393c0825d1..592c16a5caa4 100644 --- a/init/main.c +++ b/init/main.c @@ -865,7 +865,7 @@ static int __init kernel_init(void * unused) /* * init can allocate pages on any node */ - set_mems_allowed(node_possible_map); + set_mems_allowed(node_states[N_HIGH_MEMORY]); /* * init can run on any cpu. */ |