diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 11:19:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 11:19:14 -0400 |
commit | 51f00a471ce8f359627dd99aeac322947a0e491b (patch) | |
tree | de3f0c26359d7846fc5d6d0fdd147e225d979add /arch/sparc/mm | |
parent | a7f505c6b15fb35c0de8136e370d2927ce29452c (diff) | |
parent | 97ff46cb69da22037346670ae515217c658ace02 (diff) |
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
mtd/m25p80: add support to parse the partitions by OF node
of/irq: of_irq.c needs to include linux/irq.h
of/mips: Cleanup some include directives/files.
of/mips: Add device tree support to MIPS
of/flattree: Eliminate need to provide early_init_dt_scan_chosen_arch
of/device: Rework to use common platform_device_alloc() for allocating devices
of/xsysace: Fix OF probing on little-endian systems
of: use __be32 types for big-endian device tree data
of/irq: remove references to NO_IRQ in drivers/of/platform.c
of/promtree: add package-to-path support to pdt
of/promtree: add of_pdt namespace to pdt code
of/promtree: no longer call prom_ functions directly; use an ops structure
of/promtree: make drivers/of/pdt.c no longer sparc-only
sparc: break out some PROM device-tree building code out into drivers/of
of/sparc: convert various prom_* functions to use phandle
sparc: stop exporting openprom.h header
powerpc, of_serial: Endianness issues setting up the serial ports
of: MTD: Fix OF probing on little-endian systems
of: GPIO: Fix OF probing on little-endian systems
Diffstat (limited to 'arch/sparc/mm')
-rw-r--r-- | arch/sparc/mm/init_64.c | 2 | ||||
-rw-r--r-- | arch/sparc/mm/srmmu.c | 8 | ||||
-rw-r--r-- | arch/sparc/mm/sun4c.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index 4c2572773b55..2f6ae1d1fb6b 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c | |||
@@ -88,7 +88,7 @@ static void __init read_obp_memory(const char *property, | |||
88 | struct linux_prom64_registers *regs, | 88 | struct linux_prom64_registers *regs, |
89 | int *num_ents) | 89 | int *num_ents) |
90 | { | 90 | { |
91 | int node = prom_finddevice("/memory"); | 91 | phandle node = prom_finddevice("/memory"); |
92 | int prop_size = prom_getproplen(node, property); | 92 | int prop_size = prom_getproplen(node, property); |
93 | int ents, ret, i; | 93 | int ents, ret, i; |
94 | 94 | ||
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index b0b43aa5e45a..92319aa8b662 100644 --- a/arch/sparc/mm/srmmu.c +++ b/arch/sparc/mm/srmmu.c | |||
@@ -1262,7 +1262,8 @@ extern unsigned long bootmem_init(unsigned long *pages_avail); | |||
1262 | 1262 | ||
1263 | void __init srmmu_paging_init(void) | 1263 | void __init srmmu_paging_init(void) |
1264 | { | 1264 | { |
1265 | int i, cpunode; | 1265 | int i; |
1266 | phandle cpunode; | ||
1266 | char node_str[128]; | 1267 | char node_str[128]; |
1267 | pgd_t *pgd; | 1268 | pgd_t *pgd; |
1268 | pmd_t *pmd; | 1269 | pmd_t *pmd; |
@@ -1398,7 +1399,8 @@ static void __init srmmu_is_bad(void) | |||
1398 | 1399 | ||
1399 | static void __init init_vac_layout(void) | 1400 | static void __init init_vac_layout(void) |
1400 | { | 1401 | { |
1401 | int nd, cache_lines; | 1402 | phandle nd; |
1403 | int cache_lines; | ||
1402 | char node_str[128]; | 1404 | char node_str[128]; |
1403 | #ifdef CONFIG_SMP | 1405 | #ifdef CONFIG_SMP |
1404 | int cpu = 0; | 1406 | int cpu = 0; |
@@ -2082,7 +2084,7 @@ static void __init get_srmmu_type(void) | |||
2082 | 2084 | ||
2083 | /* Next check for Fujitsu Swift. */ | 2085 | /* Next check for Fujitsu Swift. */ |
2084 | if(psr_typ == 0 && psr_vers == 4) { | 2086 | if(psr_typ == 0 && psr_vers == 4) { |
2085 | int cpunode; | 2087 | phandle cpunode; |
2086 | char node_str[128]; | 2088 | char node_str[128]; |
2087 | 2089 | ||
2088 | /* Look if it is not a TurboSparc emulating Swift... */ | 2090 | /* Look if it is not a TurboSparc emulating Swift... */ |
diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c index 4289f90f8697..ddd0d86e508e 100644 --- a/arch/sparc/mm/sun4c.c +++ b/arch/sparc/mm/sun4c.c | |||
@@ -420,7 +420,7 @@ volatile unsigned long __iomem *sun4c_memerr_reg = NULL; | |||
420 | 420 | ||
421 | void __init sun4c_probe_memerr_reg(void) | 421 | void __init sun4c_probe_memerr_reg(void) |
422 | { | 422 | { |
423 | int node; | 423 | phandle node; |
424 | struct linux_prom_registers regs[1]; | 424 | struct linux_prom_registers regs[1]; |
425 | 425 | ||
426 | node = prom_getchild(prom_root_node); | 426 | node = prom_getchild(prom_root_node); |