projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
powerpc: Shield code specific to 64-bit server processors
[deliverable/linux.git]
/
arch
/
powerpc
/
kernel
/
prom.c
diff --git
a/arch/powerpc/kernel/prom.c
b/arch/powerpc/kernel/prom.c
index 5ec6a9e239337e6170cf6d0ededaf0c687b78282..d4405b95bfaa708b4511e259d6a5e6b1a73582d9 100644
(file)
--- a/
arch/powerpc/kernel/prom.c
+++ b/
arch/powerpc/kernel/prom.c
@@
-426,7
+426,7
@@
static int __init early_parse_mem(char *p)
return 1;
memory_limit = PAGE_ALIGN(memparse(p, &p));
return 1;
memory_limit = PAGE_ALIGN(memparse(p, &p));
- DBG("memory limit = 0x%l
x\n",
memory_limit);
+ DBG("memory limit = 0x%l
lx\n", (unsigned long long)
memory_limit);
return 0;
}
return 0;
}
@@
-585,7
+585,7
@@
static void __init check_cpu_pa_features(unsigned long node)
ibm_pa_features, ARRAY_SIZE(ibm_pa_features));
}
ibm_pa_features, ARRAY_SIZE(ibm_pa_features));
}
-#ifdef CONFIG_PPC64
+#ifdef CONFIG_PPC
_STD_MMU_
64
static void __init check_cpu_slb_size(unsigned long node)
{
u32 *slb_size_ptr;
static void __init check_cpu_slb_size(unsigned long node)
{
u32 *slb_size_ptr;
@@
-1160,7
+1160,7
@@
static inline void __init phyp_dump_reserve_mem(void) {}
void __init early_init_devtree(void *params)
{
void __init early_init_devtree(void *params)
{
-
unsigned long
limit;
+
phys_addr_t
limit;
DBG(" -> early_init_devtree(%p)\n", params);
DBG(" -> early_init_devtree(%p)\n", params);
@@
-1204,7
+1204,7
@@
void __init early_init_devtree(void *params)
limit = memory_limit;
if (! limit) {
limit = memory_limit;
if (! limit) {
-
unsigned long
memsize;
+
phys_addr_t
memsize;
/* Ensure that total memory size is page-aligned, because
* otherwise mark_bootmem() gets upset. */
/* Ensure that total memory size is page-aligned, because
* otherwise mark_bootmem() gets upset. */
@@
-1218,7
+1218,7
@@
void __init early_init_devtree(void *params)
lmb_analyze();
lmb_dump_all();
lmb_analyze();
lmb_dump_all();
- DBG("Phys. mem: %lx\n", lmb_phys_mem_size());
+ DBG("Phys. mem: %l
l
x\n", lmb_phys_mem_size());
/* We may need to relocate the flat tree, do it now.
* FIXME .. and the initrd too? */
/* We may need to relocate the flat tree, do it now.
* FIXME .. and the initrd too? */
This page took
0.024484 seconds
and
5
git commands to generate.