diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 01:46:20 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 01:46:20 -0500 |
| commit | 80c7af4074cbb4cb6be5d35c443ea6d5e8838a84 (patch) | |
| tree | e900ad4c0beb4f44f0912b847c3319f11ef57d73 /arch/powerpc/mm/numa.c | |
| parent | 451ec6ab310602515b361418debe93d00f67e273 (diff) | |
| parent | d00d598ffbba974d9045ba8b95296655fe2162c5 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'arch/powerpc/mm/numa.c')
| -rw-r--r-- | arch/powerpc/mm/numa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index f72cf87364cb..ba7a3055a9fc 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c | |||
| @@ -125,7 +125,7 @@ void __init get_region(unsigned int nid, unsigned long *start_pfn, | |||
| 125 | 125 | ||
| 126 | /* We didnt find a matching region, return start/end as 0 */ | 126 | /* We didnt find a matching region, return start/end as 0 */ |
| 127 | if (*start_pfn == -1UL) | 127 | if (*start_pfn == -1UL) |
| 128 | start_pfn = 0; | 128 | *start_pfn = 0; |
| 129 | } | 129 | } |
| 130 | 130 | ||
| 131 | static inline void map_cpu_to_node(int cpu, int node) | 131 | static inline void map_cpu_to_node(int cpu, int node) |