diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
| commit | fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c (patch) | |
| tree | feb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3 /arch/powerpc/kernel/setup_64.c | |
| parent | a3d732f93785da17e0137210deadb4616f5536fc (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
Merge branch 'linus' into x86/uv
Diffstat (limited to 'arch/powerpc/kernel/setup_64.c')
| -rw-r--r-- | arch/powerpc/kernel/setup_64.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 843c0af210d0..169d74cef157 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c | |||
| @@ -444,9 +444,9 @@ void __init setup_system(void) | |||
| 444 | if (htab_address) | 444 | if (htab_address) |
| 445 | printk("htab_address = 0x%p\n", htab_address); | 445 | printk("htab_address = 0x%p\n", htab_address); |
| 446 | printk("htab_hash_mask = 0x%lx\n", htab_hash_mask); | 446 | printk("htab_hash_mask = 0x%lx\n", htab_hash_mask); |
| 447 | #if PHYSICAL_START > 0 | 447 | if (PHYSICAL_START > 0) |
| 448 | printk("physical_start = 0x%lx\n", PHYSICAL_START); | 448 | printk("physical_start = 0x%lx\n", |
| 449 | #endif | 449 | PHYSICAL_START); |
| 450 | printk("-----------------------------------------------------\n"); | 450 | printk("-----------------------------------------------------\n"); |
| 451 | 451 | ||
| 452 | DBG(" <- setup_system()\n"); | 452 | DBG(" <- setup_system()\n"); |