diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
| commit | 239060b93bb30a4ad55f1ecaa512464a035cc5ba (patch) | |
| tree | 77f79810e57d4fc24356eca0cd6db463e8994128 /arch/ia64/sn/kernel/setup.c | |
| parent | 1408b15b98635a13bad2e2a50b3c2ae2ccdf625b (diff) | |
| parent | e9203c988234aa512bd45ca32b52e21c7bbfc414 (diff) | |
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
We need to revert the temporary hack in 71ebc01, hence the merge.
Diffstat (limited to 'arch/ia64/sn/kernel/setup.c')
| -rw-r--r-- | arch/ia64/sn/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c index d00dfc180021..dbc4cbecb5ed 100644 --- a/arch/ia64/sn/kernel/setup.c +++ b/arch/ia64/sn/kernel/setup.c | |||
| @@ -507,7 +507,7 @@ static void __init sn_init_pdas(char **cmdline_p) | |||
| 507 | cnodeid_t cnode; | 507 | cnodeid_t cnode; |
| 508 | 508 | ||
| 509 | /* | 509 | /* |
| 510 | * Allocate & initalize the nodepda for each node. | 510 | * Allocate & initialize the nodepda for each node. |
| 511 | */ | 511 | */ |
| 512 | for_each_online_node(cnode) { | 512 | for_each_online_node(cnode) { |
| 513 | nodepdaindr[cnode] = | 513 | nodepdaindr[cnode] = |