* [PATCH v2 0/4] Fixes for 2.6.26
@ 2008-05-20 5:43 Kumar Gala
2008-05-20 5:43 ` [PATCH 1/4] lmb: Fix compile warning Kumar Gala
0 siblings, 1 reply; 7+ messages in thread
From: Kumar Gala @ 2008-05-20 5:43 UTC (permalink / raw)
To: paulus; +Cc: linuxppc-dev
Please pull from 'for-2.6.26' branch of
master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for-2.6.26
to receive the following updates:
arch/powerpc/boot/.gitignore | 8 +++-----
arch/powerpc/boot/Makefile | 6 ++++--
arch/powerpc/boot/dts/mpc8377_mds.dts | 18 +++++++++++++-----
lib/lmb.c | 3 ++-
4 files changed, 22 insertions(+), 13 deletions(-)
Kumar Gala (4):
lmb: Fix compile warning
[POWERPC] Remove generated files on make clean
[POWERPC] Update arch/powerpc/boot/.gitignore
[POWERPC] Fix mpc8377_mds.dts DMA nodes to match spec
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/4] lmb: Fix compile warning 2008-05-20 5:43 [PATCH v2 0/4] Fixes for 2.6.26 Kumar Gala @ 2008-05-20 5:43 ` Kumar Gala 2008-05-20 5:43 ` [PATCH 2/4] [POWERPC] Remove generated files on make clean Kumar Gala 0 siblings, 1 reply; 7+ messages in thread From: Kumar Gala @ 2008-05-20 5:43 UTC (permalink / raw) To: paulus; +Cc: linuxppc-dev, davem, linux-kernel lib/lmb.c: In function 'lmb_dump_all': lib/lmb.c:51: warning: format '%lx' expects type 'long unsigned int', but argument 2 has type 'u64' Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: David S. Miller <davem@davemloft.net> --- lib/lmb.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lib/lmb.c b/lib/lmb.c index 867f7b5..5d7b928 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -48,7 +48,8 @@ void lmb_dump_all(void) } pr_info(" reserved.cnt = 0x%lx\n", lmb.reserved.cnt); - pr_info(" reserved.size = 0x%lx\n", lmb.reserved.size); + pr_info(" reserved.size = 0x%llx\n", + (unsigned long long)lmb.memory.size); for (i=0; i < lmb.reserved.cnt ;i++) { pr_info(" reserved.region[0x%lx].base = 0x%llx\n", i, (unsigned long long)lmb.reserved.region[i].base); -- 1.5.4.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/4] [POWERPC] Remove generated files on make clean 2008-05-20 5:43 ` [PATCH 1/4] lmb: Fix compile warning Kumar Gala @ 2008-05-20 5:43 ` Kumar Gala 2008-05-20 5:43 ` [PATCH 3/4] [POWERPC] Update arch/powerpc/boot/.gitignore Kumar Gala 0 siblings, 1 reply; 7+ messages in thread From: Kumar Gala @ 2008-05-20 5:43 UTC (permalink / raw) To: paulus; +Cc: linuxppc-dev dtbImage.* and several zImage. targets get created but never cleaned up. Also, moved zImage to the clean-files line associated with all other image results (was previously duplicated). Signed-off-by: Kumar Gala <galak@kernel.crashing.org> --- arch/powerpc/boot/Makefile | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 7822d25..f5e0b2a 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -99,7 +99,7 @@ $(obj)/zImage.lds $(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds: $(obj)/%: $(srct @cp $< $@ clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) \ - empty.c zImage zImage.coff.lds zImage.ps3.lds zImage.lds + empty.c zImage.coff.lds zImage.ps3.lds zImage.lds quiet_cmd_bootcc = BOOTCC $@ cmd_bootcc = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $< @@ -339,7 +339,9 @@ install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y)) sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $< # anything not in $(targets) -clean-files += $(image-) $(initrd-) zImage zImage.initrd cuImage.* treeImage.* \ +clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \ + zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \ + zImage.iseries zImage.miboot zImage.pmac zImage.pseries \ otheros.bld *.dtb # clean up files cached by wrapper -- 1.5.4.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/4] [POWERPC] Update arch/powerpc/boot/.gitignore 2008-05-20 5:43 ` [PATCH 2/4] [POWERPC] Remove generated files on make clean Kumar Gala @ 2008-05-20 5:43 ` Kumar Gala 2008-05-20 5:43 ` [PATCH 4/4] [POWERPC] Fix mpc8377_mds.dts DMA nodes to match spec Kumar Gala 0 siblings, 1 reply; 7+ messages in thread From: Kumar Gala @ 2008-05-20 5:43 UTC (permalink / raw) To: paulus; +Cc: linuxppc-dev * Add dtbImage.* * Added zImage.holly * Folded zImage.coff.lds into zImage.*lds * Removed some unused zImage.<foo> ignores Signed-off-by: Kumar Gala <galak@kernel.crashing.org> --- arch/powerpc/boot/.gitignore | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore index 2347294..2f50acd 100644 --- a/arch/powerpc/boot/.gitignore +++ b/arch/powerpc/boot/.gitignore @@ -20,21 +20,19 @@ kernel-vmlinux.strip.gz mktree uImage cuImage.* +dtbImage.* treeImage.* zImage +zImage.initrd zImage.bin.* zImage.chrp zImage.coff -zImage.coff.lds -zImage.ep* +zImage.holly zImage.iseries zImage.*lds zImage.miboot zImage.pmac zImage.pseries -zImage.redboot* -zImage.sandpoint -zImage.vmode zconf.h zlib.h zutil.h -- 1.5.4.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/4] [POWERPC] Fix mpc8377_mds.dts DMA nodes to match spec 2008-05-20 5:43 ` [PATCH 3/4] [POWERPC] Update arch/powerpc/boot/.gitignore Kumar Gala @ 2008-05-20 5:43 ` Kumar Gala 0 siblings, 0 replies; 7+ messages in thread From: Kumar Gala @ 2008-05-20 5:43 UTC (permalink / raw) To: paulus; +Cc: linuxppc-dev Signed-off-by: Kumar Gala <galak@kernel.crashing.org> --- arch/powerpc/boot/dts/mpc8377_mds.dts | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts index 1e7802c..fea5925 100644 --- a/arch/powerpc/boot/dts/mpc8377_mds.dts +++ b/arch/powerpc/boot/dts/mpc8377_mds.dts @@ -271,27 +271,35 @@ dma@82a8 { #address-cells = <1>; #size-cells = <1>; - compatible = "fsl,mpc8349-dma"; + compatible = "fsl,mpc8377-dma", "fsl,elo-dma"; reg = <0x82a8 4>; ranges = <0 0x8100 0x1a8>; interrupt-parent = <&ipic>; interrupts = <0x47 8>; cell-index = <0>; dma-channel@0 { - compatible = "fsl,mpc8349-dma-channel"; + compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel"; reg = <0 0x80>; + interrupt-parent = <&ipic>; + interrupts = <0x47 8>; }; dma-channel@80 { - compatible = "fsl,mpc8349-dma-channel"; + compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel"; reg = <0x80 0x80>; + interrupt-parent = <&ipic>; + interrupts = <0x47 8>; }; dma-channel@100 { - compatible = "fsl,mpc8349-dma-channel"; + compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel"; reg = <0x100 0x80>; + interrupt-parent = <&ipic>; + interrupts = <0x47 8>; }; dma-channel@180 { - compatible = "fsl,mpc8349-dma-channel"; + compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel"; reg = <0x180 0x28>; + interrupt-parent = <&ipic>; + interrupts = <0x47 8>; }; }; -- 1.5.4.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 0/4] minor fixes for 2.6.26
@ 2008-05-18 18:44 Kumar Gala
2008-05-18 18:44 ` [PATCH 1/4] lmb: Fix compile warning Kumar Gala
0 siblings, 1 reply; 7+ messages in thread
From: Kumar Gala @ 2008-05-18 18:44 UTC (permalink / raw)
To: paulus; +Cc: linuxppc-dev
Please pull from 'for-2.6.26' branch of
master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for-2.6.26
to receive the following updates:
arch/powerpc/boot/.gitignore | 15 ++-------------
arch/powerpc/boot/Makefile | 4 ++--
arch/powerpc/boot/dts/mpc8377_mds.dts | 18 +++++++++++++-----
lib/lmb.c | 2 +-
4 files changed, 18 insertions(+), 21 deletions(-)
Kumar Gala (4):
lmb: Fix compile warning
[POWERPC] Remove generated files on make clean
[POWERPC] Update arch/powerpc/boot/.gitignore
[POWERPC] Fix mpc8377_mds.dts DMA nodes to match spec
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/4] lmb: Fix compile warning 2008-05-18 18:44 [PATCH 0/4] minor fixes for 2.6.26 Kumar Gala @ 2008-05-18 18:44 ` Kumar Gala 2008-05-19 3:31 ` David Miller 0 siblings, 1 reply; 7+ messages in thread From: Kumar Gala @ 2008-05-18 18:44 UTC (permalink / raw) To: paulus; +Cc: linuxppc-dev, davem, linux-kernel lib/lmb.c: In function 'lmb_dump_all': lib/lmb.c:51: warning: format '%lx' expects type 'long unsigned int', but argument 2 has type 'u64' Signed-off-by: Kumar Gala <galak@kernel.crashing.org> --- lib/lmb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/lmb.c b/lib/lmb.c index 867f7b5..553a47c 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -48,7 +48,7 @@ void lmb_dump_all(void) } pr_info(" reserved.cnt = 0x%lx\n", lmb.reserved.cnt); - pr_info(" reserved.size = 0x%lx\n", lmb.reserved.size); + pr_info(" reserved.size = 0x%llx\n", lmb.reserved.size); for (i=0; i < lmb.reserved.cnt ;i++) { pr_info(" reserved.region[0x%lx].base = 0x%llx\n", i, (unsigned long long)lmb.reserved.region[i].base); -- 1.5.4.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/4] lmb: Fix compile warning 2008-05-18 18:44 ` [PATCH 1/4] lmb: Fix compile warning Kumar Gala @ 2008-05-19 3:31 ` David Miller 0 siblings, 0 replies; 7+ messages in thread From: David Miller @ 2008-05-19 3:31 UTC (permalink / raw) To: galak; +Cc: linuxppc-dev, paulus, linux-kernel From: Kumar Gala <galak@kernel.crashing.org> Date: Sun, 18 May 2008 13:44:53 -0500 > lib/lmb.c: In function 'lmb_dump_all': > lib/lmb.c:51: warning: format '%lx' expects type 'long unsigned int', but argument 2 has type 'u64' > > Signed-off-by: Kumar Gala <galak@kernel.crashing.org> That's not right either. We'll need to cast this argument because it's a different type on sparc vs sparc64 vs powerpc. u64 != unsigned long long ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2008-05-20 5:43 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2008-05-20 5:43 [PATCH v2 0/4] Fixes for 2.6.26 Kumar Gala 2008-05-20 5:43 ` [PATCH 1/4] lmb: Fix compile warning Kumar Gala 2008-05-20 5:43 ` [PATCH 2/4] [POWERPC] Remove generated files on make clean Kumar Gala 2008-05-20 5:43 ` [PATCH 3/4] [POWERPC] Update arch/powerpc/boot/.gitignore Kumar Gala 2008-05-20 5:43 ` [PATCH 4/4] [POWERPC] Fix mpc8377_mds.dts DMA nodes to match spec Kumar Gala -- strict thread matches above, loose matches on Subject: below -- 2008-05-18 18:44 [PATCH 0/4] minor fixes for 2.6.26 Kumar Gala 2008-05-18 18:44 ` [PATCH 1/4] lmb: Fix compile warning Kumar Gala 2008-05-19 3:31 ` David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).