diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-15 11:07:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-15 11:07:35 -0400 |
commit | 5f2434a66dfa4701b81b79a78eaf9c32da0f8839 (patch) | |
tree | 8c38f1fb0d0fbcd15e496df89be00ad8c4918a43 /arch/powerpc/boot/libfdt/fdt_wip.c | |
parent | 278429cff8809958d25415ba0ed32b59866ab1a8 (diff) | |
parent | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (diff) |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (158 commits)
powerpc: Fix CHRP PCI config access for indirect_pci
powerpc/chrp: Fix detection of Python PCI host bridge on IBM CHRPs
powerpc: Fix 32-bit SMP boot on CHRP
powerpc: Fix link errors on 32-bit machines using legacy DMA
powerpc/pci: Improve detection of unassigned bridge resources
hvc_console: Fix free_irq in spinlocked section
powerpc: Get USE_STRICT_MM_TYPECHECKS working again
powerpc: Reflect the used arguments in machine_init() prototype
powerpc: Fix DMA offset for non-coherent DMA
powerpc: fix fsl_upm nand driver modular build
powerpc/83xx: add NAND support for the MPC8360E-RDK boards
powerpc: FPGA support for GE Fanuc SBC610
i2c: MPC8349E-mITX Power Management and GPIO expander driver
powerpc: reserve two DMA channels for audio in MPC8610 HPCD device tree
powerpc: document the "fsl,ssi-dma-channel" compatible property
powerpc: disable CHRP and PMAC support in various defconfigs
OF: add fsl,mcu-mpc8349emitx to the exception list
powerpc/83xx: add DS1374 RTC support for the MPC837xE-MDS boards
powerpc: remove support for bootmem-allocated memory for the DIU driver
powerpc: remove non-dependent load fsl_booke PTE_64BIT
...
Diffstat (limited to 'arch/powerpc/boot/libfdt/fdt_wip.c')
-rw-r--r-- | arch/powerpc/boot/libfdt/fdt_wip.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/powerpc/boot/libfdt/fdt_wip.c b/arch/powerpc/boot/libfdt/fdt_wip.c index 88e24b8318f4..a4652c6e787e 100644 --- a/arch/powerpc/boot/libfdt/fdt_wip.c +++ b/arch/powerpc/boot/libfdt/fdt_wip.c | |||
@@ -72,11 +72,11 @@ int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name, | |||
72 | return 0; | 72 | return 0; |
73 | } | 73 | } |
74 | 74 | ||
75 | static void nop_region(void *start, int len) | 75 | static void _fdt_nop_region(void *start, int len) |
76 | { | 76 | { |
77 | uint32_t *p; | 77 | uint32_t *p; |
78 | 78 | ||
79 | for (p = start; (void *)p < (start + len); p++) | 79 | for (p = start; (char *)p < ((char *)start + len); p++) |
80 | *p = cpu_to_fdt32(FDT_NOP); | 80 | *p = cpu_to_fdt32(FDT_NOP); |
81 | } | 81 | } |
82 | 82 | ||
@@ -89,7 +89,7 @@ int fdt_nop_property(void *fdt, int nodeoffset, const char *name) | |||
89 | if (! prop) | 89 | if (! prop) |
90 | return len; | 90 | return len; |
91 | 91 | ||
92 | nop_region(prop, len + sizeof(*prop)); | 92 | _fdt_nop_region(prop, len + sizeof(*prop)); |
93 | 93 | ||
94 | return 0; | 94 | return 0; |
95 | } | 95 | } |
@@ -139,6 +139,7 @@ int fdt_nop_node(void *fdt, int nodeoffset) | |||
139 | if (endoffset < 0) | 139 | if (endoffset < 0) |
140 | return endoffset; | 140 | return endoffset; |
141 | 141 | ||
142 | nop_region(fdt_offset_ptr_w(fdt, nodeoffset, 0), endoffset - nodeoffset); | 142 | _fdt_nop_region(fdt_offset_ptr_w(fdt, nodeoffset, 0), |
143 | endoffset - nodeoffset); | ||
143 | return 0; | 144 | return 0; |
144 | } | 145 | } |