* Re: [PATCH] net: Fix ucc_geth.c handling of phy 'interface' property.
From: Grant Likely @ 2009-04-28 13:37 UTC (permalink / raw)
To: David Miller; +Cc: Joakim.Tjernlund, linuxppc-dev, afleming, netdev, scottwood
In-Reply-To: <20090428.021203.74435054.davem@davemloft.net>
On Tue, Apr 28, 2009 at 3:12 AM, David Miller <davem@davemloft.net> wrote:
> From: Grant Likely <grant.likely@secretlab.ca>
> Date: Mon, 27 Apr 2009 11:50:20 -0600
>
>> On Mon, Apr 27, 2009 at 11:36 AM, Scott Wood <scottwood@freescale.com> w=
rote:
>>> On Mon, Apr 27, 2009 at 09:36:13AM -0600, Grant Likely wrote:
>>>> From: Grant Likely <grant.likely@secretlab.ca>
>>>>
>>>> Previous rework to ucc_geth.c to add of_mdio support (net: Rework
>>>> ucc_geth driver to use of_mdio infrastructure) added a block of
>>>> code which broke older openfirmware device trees which use an
>>>> 'interface' property in the phy node to describe the connection
>>>> between the MAC and the PHY. =A0This patch removes the offending blurb=
.
>>> [snip]
>>>> =A0 =A0 =A0 prop =3D of_get_property(np, "phy-connection-type", NULL);
>>>> =A0 =A0 =A0 if (!prop) {
>>>> =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* handle interface property present in ol=
d trees */
>>>> - =A0 =A0 =A0 =A0 =A0 =A0 if (!phy)
>>>> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 return -ENODEV;
>>>> -
>>>> =A0 =A0 =A0 =A0 =A0 =A0 =A0 prop =3D of_get_property(phy, "interface",=
NULL);
>>>> =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (prop !=3D NULL) {
>>>> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 phy_interface =3D enet_to_=
phy_interface[*prop];
>>>
>>> The above test only makes a difference when there is no phy node -- so =
I
>>> don't see how it was breaking device trees that had a phy node (with or
>>> without an "interface" property). =A0I can see it breaking fixed link
>>> device trees, though.
>>
>> Sorry, you're right. =A0I got myself confused when I was writing the
>> description. =A0This patch fixes breakage when using a fixed-link and
>> there is no phy-connection-type property.
>
> Patch applied with commit message fixed up.
Thanks David
g.
--=20
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply
* Re: [PATCH] fsldma: use PCI Read Multiple command
From: Timur Tabi @ 2009-04-28 13:43 UTC (permalink / raw)
To: David Hawkins
Cc: linuxppc-dev, Dan Williams, Liu Dave-R63238, linux-kernel,
Ira Snyder
In-Reply-To: <49F65DBA.2090702@ovro.caltech.edu>
David Hawkins wrote:
>> How about FIFO RAM case?
>
> If the FIFO has a fixed address, then according to
> the user guide, the DMA controller won't generate
> a burst transaction to it.
>
> We can try confirming this if you'd like.
Like I said earlier, this driver does not support copying data to/from a
single register address. It's just a off-loaded memcpy. So we don't
need to worry about what happens to a fixed address.
--
Timur Tabi
Linux kernel developer at Freescale
^ permalink raw reply
* Re: removing get_immrbase()??
From: Timur Tabi @ 2009-04-28 13:48 UTC (permalink / raw)
To: Kumar Gala, Scott Wood, Linuxppc-dev Development
In-Reply-To: <20090428041257.GC11265@yookeroo.seuss>
David Gibson wrote:
> On Wed, Apr 22, 2009 at 11:41:31PM -0500, Kumar Gala wrote:
>> Lets say I had an error driver for our MCM (core to soc coherency
>> module). It was getting the base address by using get_immrbase().
>> Today I proposed a proper device node for the MCM block as it doesn't
>> exist in .dts today. We add such a node into .dts and I can clean up my
>> error driver to use proper device node information. However I've just
>> broken any old .dts that didn't have this node. You are saying I need to
>> add code into the kernel to create this new node and we have to keep that
>> code around for ever in the kernel.. why would I ever bother to actually
>> changing anything than.
>
> Well, again. It's a judgement call, balancing the pain of having to
> update the dts files (which depends on how widely deployed the
> platform is) versus the pain of having to keep the bacwards
> compatibility shim in the kernel.
I agree with this sentiment. I'm only asking for a reasonable attempt
at adding backwards compatibility via an isolated code block. Sprinkle
in a few comments, and that should be enough. It won't always be
possible to add such code, but at the very least, I expect the
driver/kernel to clearly indicate what's missing from the device tree.
In Kumar's example above, I expect the kernel to say that the MCM node
is missing.
--
Timur Tabi
Linux kernel developer at Freescale
^ permalink raw reply
* [PATCH] of: make of_(un)register_platform_driver common code.
From: Grant Likely @ 2009-04-28 13:58 UTC (permalink / raw)
To: akpm, sparclinux, davem, linuxppc-dev, rpurdie, smaclennan,
monstr, john.williams
From: Grant Likely <grant.likely@secretlab.ca>
Some drivers using of_register_platform_driver() wrapper break on sparc
because the wrapper isn't in the header file. This patch moves it from
Microblaze and PowerPC implementations and makes it common code.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: David S. Miller <davem@davemloft.net>
---
arch/microblaze/include/asm/of_platform.h | 10 ----------
arch/powerpc/include/asm/of_platform.h | 10 ----------
include/linux/of_platform.h | 10 ++++++++++
3 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/arch/microblaze/include/asm/of_platform.h b/arch/microblaze/include/asm/of_platform.h
index 187c0ee..3749127 100644
--- a/arch/microblaze/include/asm/of_platform.h
+++ b/arch/microblaze/include/asm/of_platform.h
@@ -36,16 +36,6 @@ static const struct of_device_id of_default_bus_ids[] = {
{},
};
-/* Platform drivers register/unregister */
-static inline int of_register_platform_driver(struct of_platform_driver *drv)
-{
- return of_register_driver(drv, &of_platform_bus_type);
-}
-static inline void of_unregister_platform_driver(struct of_platform_driver *drv)
-{
- of_unregister_driver(drv);
-}
-
/* Platform devices and busses creation */
extern struct of_device *of_platform_device_create(struct device_node *np,
const char *bus_id,
diff --git a/arch/powerpc/include/asm/of_platform.h b/arch/powerpc/include/asm/of_platform.h
index 53b4650..d4aaa34 100644
--- a/arch/powerpc/include/asm/of_platform.h
+++ b/arch/powerpc/include/asm/of_platform.h
@@ -11,16 +11,6 @@
*
*/
-/* Platform drivers register/unregister */
-static inline int of_register_platform_driver(struct of_platform_driver *drv)
-{
- return of_register_driver(drv, &of_platform_bus_type);
-}
-static inline void of_unregister_platform_driver(struct of_platform_driver *drv)
-{
- of_unregister_driver(drv);
-}
-
/* Platform devices and busses creation */
extern struct of_device *of_platform_device_create(struct device_node *np,
const char *bus_id,
diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
index 3d327b6..9084066 100644
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
@@ -51,6 +51,16 @@ extern int of_register_driver(struct of_platform_driver *drv,
struct bus_type *bus);
extern void of_unregister_driver(struct of_platform_driver *drv);
+/* Platform drivers register/unregister */
+static inline int of_register_platform_driver(struct of_platform_driver *drv)
+{
+ return of_register_driver(drv, &of_platform_bus_type);
+}
+static inline void of_unregister_platform_driver(struct of_platform_driver *drv)
+{
+ of_unregister_driver(drv);
+}
+
#include <asm/of_platform.h>
extern struct of_device *of_find_device_by_node(struct device_node *np);
^ permalink raw reply related
* Re: [ewg] Re: [PATCH 1/3] IB/ehca: Replace vmalloc with kmalloc
From: Alexander Schmidt @ 2009-04-28 14:13 UTC (permalink / raw)
To: Roland Dreier
Cc: fenkes, OF-EWG, LKML, LinuxPPC-Dev, raisch, alexschm,
Stefan Roscher, stefan.roscher
In-Reply-To: <adabpqgx4g3.fsf@cisco.com>
On Tue, 28 Apr 2009 07:01:32 -0700
Roland Dreier <rdreier@cisco.com> wrote:
> > did you have a chance to take a look at the patchset and will you apply it, or
> > are there any outstanding issues we need to address?
>
> I guess it's OK, but definitely 2.6.31 material. I guess I'll stick it
> linux-next soon.
>
> - R.
Okay with us, thank you very much!
Alex
^ permalink raw reply
* Re: [ewg] Re: [PATCH 1/3] IB/ehca: Replace vmalloc with kmalloc
From: Roland Dreier @ 2009-04-28 14:01 UTC (permalink / raw)
To: Alexander Schmidt
Cc: fenkes, OF-EWG, LKML, LinuxPPC-Dev, raisch, alexschm,
Stefan Roscher, stefan.roscher
In-Reply-To: <20090428150736.1ea143f0@BL3D1974.boeblingen.de.ibm.com>
> did you have a chance to take a look at the patchset and will you apply it, or
> are there any outstanding issues we need to address?
I guess it's OK, but definitely 2.6.31 material. I guess I'll stick it
linux-next soon.
- R.
^ permalink raw reply
* [PATCH] gianfar: Use memset instead of cacheable_memzero
From: Kumar Gala @ 2009-04-28 14:14 UTC (permalink / raw)
To: David Miller; +Cc: linuxppc-dev, netdev
cacheable_memzero() is completely overkill for the clearing out the FCB
block which is only 8-bytes. The compiler should easily optimize this
with memset. Additionally, cacheable_memzero() only exists on ppc32 and
thus breaks builds of gianfar on ppc64.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
drivers/net/gianfar.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index dae1437..2bb038b 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -1207,7 +1207,8 @@ static int gfar_enet_open(struct net_device *dev)
static inline struct txfcb *gfar_add_fcb(struct sk_buff *skb)
{
struct txfcb *fcb = (struct txfcb *)skb_push(skb, GMAC_FCB_LEN);
- cacheable_memzero(fcb, GMAC_FCB_LEN);
+
+ memset(fcb, 0, GMAC_FCB_LEN);
return fcb;
}
--
1.6.0.6
^ permalink raw reply related
* Re: [PATCH] powerpc: minimizing the configuration of linkstation_defconfig
From: Rogério Brito @ 2009-04-28 14:48 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev, linux-mtd, Guennadi Liakhovetski, linux-kernel
In-Reply-To: <F78629F9-59D2-4974-8461-06B7FAC2625D@kernel.crashing.org>
On Apr 28 2009, Kumar Gala wrote:
> I'm pretty sure we need this for old initrd style ramdisks so I'd prefer
> we leave it enabled.
Oh, for oldstyle it is needed. You're right. It is better to keep it in
the defconfig. Just drop the hunk from the patch that I sent you.
>> Thanks. The MTD & PHYMAP_COMPAT are the things that have been bugging
>> me and my main reason to keep with the bleeding edge kernels is to
>> get things whey they were (regarding mtd) as in kernel 2.6.28.
>>
>> As I have no experience with MTD devices, I would appreciate a
>> reference to their workings... All that I know is that all my
>> /dev/mtd* devices are gone if I boot a 2.6.29* kernel.
>>
>> Of course, I can do a git bisect process (since the MTD subsystem
>> doesn't work as it did in the past even if I enable PHYMAP_COMPAT and
>> put the same settings there, quite unfortunately).
>
> ok.. I killed my kurobox long ago so can't be much help here.
Oh... :-(
I will post the problems that I get with MTD on my kurobox so that
people from both the linux-mtd/linuxppc-dev lists can see what is
happening and suggest some fixes.
Thanks, Rogério Brito.
--
Rogério Brito : rbrito@{mackenzie,ime.usp}.br : GPG key 1024D/7C2CAEB8
http://www.ime.usp.br/~rbrito : http://meusite.mackenzie.com.br/rbrito
Projects: algorithms.berlios.de : lame.sf.net : vrms.alioth.debian.org
^ permalink raw reply
* Re: [PATCH] gianfar: Use memset instead of cacheable_memzero
From: David Miller @ 2009-04-28 15:04 UTC (permalink / raw)
To: galak; +Cc: linuxppc-dev, netdev
In-Reply-To: <1240928041-10905-1-git-send-email-galak@kernel.crashing.org>
From: Kumar Gala <galak@kernel.crashing.org>
Date: Tue, 28 Apr 2009 09:14:01 -0500
> cacheable_memzero() is completely overkill for the clearing out the FCB
> block which is only 8-bytes. The compiler should easily optimize this
> with memset. Additionally, cacheable_memzero() only exists on ppc32 and
> thus breaks builds of gianfar on ppc64.
>
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Applied to net-next-2.6, thanks!
^ permalink raw reply
* Re: [PATCH 11/14] powerpc: Use macros for .data.page_aligned section.
From: Stephen Rothwell @ 2009-04-28 15:07 UTC (permalink / raw)
To: Tim Abbott
Cc: Jeff, Denys Vlasenko, Sam Ravnborg, Waseem,
Linux kernel mailing list, Arnold, Anders Kaseorg, linuxppc-dev,
Paul Mundt, Tim Abbott, Linus Torvalds, Daher
In-Reply-To: <1240864388-26315-12-git-send-email-tabbott@mit.edu>
[-- Attachment #1: Type: text/plain, Size: 926 bytes --]
Hi Tim,
Firstly, patches for a particular architecture should really be cc'd to
the list associated with that architecture. In this case,
linuxppc-dev@ozlabs.org (cc'd).
On Mon, 27 Apr 2009 16:33:05 -0400 Tim Abbott <tabbott@MIT.EDU> wrote:
>
> +++ b/arch/powerpc/kernel/vmlinux.lds.S
> @@ -222,6 +222,7 @@ SECTIONS
>
> #ifdef CONFIG_PPC32
> .data : AT(ADDR(.data) - LOAD_OFFSET) {
> + PAGE_ALIGNED_DATA
> DATA_DATA
> *(.sdata)
> *(.got.plt) *(.got)
> @@ -259,11 +260,6 @@ SECTIONS
> *(.data.init_task)
> }
>
> - . = ALIGN(PAGE_SIZE);
> - .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) {
> - *(.data.page_aligned)
> - }
> -
This moves the page_aligned section from a common part of the
vmlinux.lds to a 32 bit only part. Was that intentional?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: [PATCH 1/3] IB/ehca: Replace vmalloc with kmalloc
From: Dave Hansen @ 2009-04-28 15:12 UTC (permalink / raw)
To: Stefan Roscher
Cc: fenkes, LKML, OF-EWG, LinuxPPC-Dev, raisch, alexschm,
stefan.roscher
In-Reply-To: <200904211716.45245.ossrosch@linux.vnet.ibm.com>
On Tue, 2009-04-21 at 17:16 +0200, Stefan Roscher wrote:
> From: Anton Blanchard <antonb at au1.ibm.com>
>
> To improve performance of driver ressource allocation,
> replace the vmalloc() call with kmalloc().
Just curious, but how big are these allocations? Why was vmalloc() even
ever used if we know they'll be small?
-- Dave
^ permalink raw reply
* Re: [PATCH 11/14] powerpc: Use macros for .data.page_aligned section.
From: Stephen Rothwell @ 2009-04-28 15:17 UTC (permalink / raw)
To: Tim Abbott
Cc: Jeff, Denys Vlasenko, Sam Ravnborg, Waseem,
Linux kernel mailing list, Arnold, Anders Kaseorg, linuxppc-dev,
Paul Mundt, Tim Abbott, Linus Torvalds, Daher
In-Reply-To: <20090429010753.851e0f59.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 369 bytes --]
On Wed, 29 Apr 2009 01:07:53 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> This moves the page_aligned section from a common part of the
> vmlinux.lds to a 32 bit only part. Was that intentional?
Just saw your later patches, so ignore this.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: [PATCH 11/14] powerpc: Use macros for .data.page_aligned section.
From: Tim Abbott @ 2009-04-28 15:13 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Denys Vlasenko, Sam Ravnborg, Jeff Arnold,
Linux kernel mailing list, Anders Kaseorg, linuxppc-dev,
Paul Mundt, Linus Torvalds, Waseem Daher
In-Reply-To: <20090429010753.851e0f59.sfr@canb.auug.org.au>
On Wed, 29 Apr 2009, Stephen Rothwell wrote:
> This moves the page_aligned section from a common part of the
> vmlinux.lds to a 32 bit only part. Was that intentional?
No. See my reply to this patch from last night
<http://lkml.org/lkml/2009/4/28/16> and the revised pair of patches in
reply to that message that replace PATCH 11/14.
-Tim Abbott
^ permalink raw reply
* Re: Please revert edada399 and 9203fc9c
From: Tim Abbott @ 2009-04-28 15:47 UTC (permalink / raw)
To: Paul Mackerras; +Cc: Linus Torvalds, linux-kernel, linuxppc-dev
In-Reply-To: <18934.35969.872225.70725@cargo.ozlabs.ibm.com>
> Please revert commits edada399 ("powerpc: Use TEXT_TEXT macro in
> linker script.") and 9203fc9c ("powerpc: Use __REF macro instead of
> old .text.init.refok."), which depends on edada399.
Paul,
Sorry for breaking the build. I will be sure to CC you and
linuxppc-dev@ozlabs.org on future powerpc patches in this section name
cleanup project.
I think just reverting commits edada399 and 9203fc9c will cause a section
mismatch warning since commit 27b18332 removed the support code for the
.text.init.refok section. The following patch I believe should fix this
by effectively reverting just commit edada399. Can someone who has a
64-bit powerpc machine confirm?
-Tim Abbott
--
powerpc: Revert switch to TEXT_TEXT in linker script
Commit edada399 broke the build on 64-bit powerpc because it moved the
__ftr_alt_* sections of a file away from the .text section, causing
link failures due to relative conditional branch targets being too far
away from the branch instructions. This happens on pretty much all
64-bit powerpc configs.
This change reverts commit edada399 while preserving the update from
the *.refok sections to .ref.text that has happened since.
Signed-off-by: Tim Abbott <tabbott@mit.edu>
---
arch/powerpc/kernel/vmlinux.lds.S | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 433ae11..a047a6c 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -54,8 +54,8 @@ SECTIONS
ALIGN_FUNCTION();
HEAD_TEXT
_text = .;
- TEXT_TEXT
- *(.fixup __ftr_alt_*)
+ /* careful! __ftr_alt_* sections need to be close to .text */
+ *(.text .fixup __ftr_alt_* .ref.text)
SCHED_TEXT
LOCK_TEXT
KPROBES_TEXT
--
1.6.2.1
^ permalink raw reply related
* [PATCH] powerpc/virtex: Add uImage to the default images list
From: Grant Likely @ 2009-04-28 15:50 UTC (permalink / raw)
To: Josh Boyer, linuxppc-dev
From: Grant Likely <grant.likely@secretlab.ca>
It is common to use U-Boot on Xilinx Virtex platforms. This patch
ensures that CONFIG_DEFAULT_UIMAGE is selected for virtex
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
arch/powerpc/platforms/40x/Kconfig | 1 +
arch/powerpc/platforms/44x/Kconfig | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index 14e027f..f39c953 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -153,6 +153,7 @@ config 405GPR
config XILINX_VIRTEX
bool
+ select DEFAULT_UIMAGE
config XILINX_VIRTEX_II_PRO
bool
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index bf5c7ff..0d83a6a 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -246,6 +246,7 @@ config IBM440EP_ERR42
# Xilinx specific config options.
config XILINX_VIRTEX
bool
+ select DEFAULT_UIMAGE
# Xilinx Virtex 5 FXT FPGA architecture, selected by a Xilinx board above
config XILINX_VIRTEX_5_FXT
^ permalink raw reply related
* Re: [PATCH 1/3] IB/ehca: Replace vmalloc with kmalloc
From: Stefan Roscher @ 2009-04-28 16:02 UTC (permalink / raw)
To: Dave Hansen; +Cc: fenkes, LKML, LinuxPPC-Dev, raisch, alexschm, stefan.roscher
In-Reply-To: <1240931572.29485.77.camel@nimitz>
On Tuesday 28 April 2009 05:12:51 pm Dave Hansen wrote:
> On Tue, 2009-04-21 at 17:16 +0200, Stefan Roscher wrote:
> > From: Anton Blanchard <antonb at au1.ibm.com>
> >
> > To improve performance of driver ressource allocation,
> > replace the vmalloc() call with kmalloc().
>
> Just curious, but how big are these allocations? Why was vmalloc() even
> ever used if we know they'll be small?
>
> -- Dave
>
>
The theoretical maximum size can be 512k, but for common queue pairs
less than 128k is used.Because of the theoretical maximum we implemented
vmalloc() first, but recognized a huge performance impact.
-- Stefan
^ permalink raw reply
* Re: [PATCH] powerpc: minimizing the configuration of linkstation_defconfig
From: Kumar Gala @ 2009-04-28 14:54 UTC (permalink / raw)
To: Rogério Brito
Cc: linuxppc-dev, linux-mtd, Guennadi Liakhovetski, linux-kernel
In-Reply-To: <20090428144814.GA14926@ime.usp.br>
On Apr 28, 2009, at 9:48 AM, Rog=E9rio Brito wrote:
> On Apr 28 2009, Kumar Gala wrote:
>> I'm pretty sure we need this for old initrd style ramdisks so I'd =20
>> prefer
>> we leave it enabled.
>
> Oh, for oldstyle it is needed. You're right. It is better to keep it =20=
> in
> the defconfig. Just drop the hunk from the patch that I sent you.
just send a new patch w/this fixed.
- k=
^ permalink raw reply
* Re: [PATCH] 83xx: add support for the kmeter1 board.
From: Scott Wood @ 2009-04-28 16:35 UTC (permalink / raw)
To: Heiko Schocher; +Cc: linuxppc-dev
In-Reply-To: <49F68943.3090800@denx.de>
On Tue, Apr 28, 2009 at 06:42:43AM +0200, Heiko Schocher wrote:
> Scott Wood wrote:
> > On Mon, Apr 27, 2009 at 07:38:38AM +0200, Heiko Schocher wrote:
> >> 1) add in the soc node an "errata" node and in this "errata" node
> >> we can add all CPU specific errata as an example the qe_enet10
> >> errata, which above code covers:
> >
> > What about errata discovered after the device tree is deployed?
>
> Didn;t know that there are such errata. Ok, this is a problem.
Bugs can be discovered at any point in time.
> > The presence of the erratum itself is indicated by the presence of the
> > buggy device, possibly in conjunction with SVR if the device tree is not
> > specific enough.
>
> Ah, Ok, that was just an idea ... so, where and how to solve the qe_enet10
> errata without using get_immrbase()
Get the register block address from the par_io node.
-Scott
^ permalink raw reply
* [PATCH 2/2] powerpc: minimizing the configuration of linkstation_defconfig
From: Rogério Brito @ 2009-04-28 16:44 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev, linux-mtd, Guennadi Liakhovetski, linux-kernel
In-Reply-To: <2CE2BC61-1C6B-4D01-870B-BC460730AD79@kernel.crashing.org>
This patch addresses the following issues:
01. makes CFQ the default scheduler, to be in line with the rest of
the kernel.
02. since linkstations are meant to store files, enable large blk
devices.
03. disable CONFIG_MIGRATION in in such low memory devices.
04. disable CONFIG_SCSI_LOWLEVEL, as no device under that tree is
used.
05. idem for CONFIG_NETDEV_10000.
06. idem for CONFIG_WIRELESS.
07. idem for CONFIG_HWMON.
08. idem for CONFIG_CRYPTO_HW.
09. disable CONFIG_VIDEO_OUTPUT_CONTROL.
10. keep consistency and disable extended attributes in CIFS, ext3,
and NFS.
11. enable CONFIG_PRINTK_TIME.
Signed-off-by: Rogério Brito <rbrito@ime.usp.br>
---
Here is the fixed patch. Thank you very much, Kumar.
--- a/arch/powerpc/configs/linkstation_defconfig 2009-04-28 09:53:38.000000000 -0300
+++ b/arch/powerpc/configs/linkstation_defconfig 2009-04-28 10:14:11.000000000 -0300
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.30-rc3
-# Tue Apr 28 09:53:38 2009
+# Tue Apr 28 10:14:11 2009
#
# CONFIG_PPC64 is not set
@@ -155,7 +155,7 @@
# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_BLOCK=y
-# CONFIG_LBD is not set
+CONFIG_LBD=y
# CONFIG_BLK_DEV_BSG is not set
# CONFIG_BLK_DEV_INTEGRITY is not set
@@ -166,11 +166,11 @@
CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_AS is not set
# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_DEFAULT_IOSCHED="cfq"
# CONFIG_FREEZER is not set
#
@@ -252,7 +252,7 @@
CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MIGRATION=y
+# CONFIG_MIGRATION is not set
# CONFIG_PHYS_ADDR_T_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1
CONFIG_BOUNCE=y
@@ -492,13 +492,7 @@
# CONFIG_IRDA is not set
# CONFIG_BT is not set
# CONFIG_AF_RXRPC is not set
-CONFIG_WIRELESS=y
-# CONFIG_CFG80211 is not set
-CONFIG_WIRELESS_OLD_REGULATORY=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
-# CONFIG_LIB80211 is not set
-# CONFIG_MAC80211 is not set
+# CONFIG_WIRELESS is not set
# CONFIG_WIMAX is not set
# CONFIG_RFKILL is not set
# CONFIG_NET_9P is not set
@@ -688,49 +679,7 @@
# CONFIG_SCSI_ISCSI_ATTRS is not set
# CONFIG_SCSI_SAS_LIBSAS is not set
# CONFIG_SCSI_SRP_ATTRS is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_ISCSI_TCP is not set
-# CONFIG_SCSI_CXGB3_ISCSI is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_MPT2SAS is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_LIBFC is not set
-# CONFIG_LIBFCOE is not set
-# CONFIG_FCOE is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_LOWLEVEL is not set
# CONFIG_SCSI_DH is not set
# CONFIG_SCSI_OSD_INITIATOR is not set
CONFIG_ATA=y
@@ -872,25 +821,7 @@
# CONFIG_ATL1E is not set
# CONFIG_ATL1C is not set
# CONFIG_JME is not set
-CONFIG_NETDEV_10000=y
-# CONFIG_CHELSIO_T1 is not set
-CONFIG_CHELSIO_T3_DEPENDS=y
-# CONFIG_CHELSIO_T3 is not set
-# CONFIG_ENIC is not set
-# CONFIG_IXGBE is not set
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-# CONFIG_VXGE is not set
-# CONFIG_MYRI10GE is not set
-# CONFIG_NETXEN_NIC is not set
-# CONFIG_NIU is not set
-# CONFIG_MLX4_EN is not set
-# CONFIG_MLX4_CORE is not set
-# CONFIG_TEHUTI is not set
-# CONFIG_BNX2X is not set
-# CONFIG_QLGE is not set
-# CONFIG_SFC is not set
-# CONFIG_BE2NET is not set
+# CONFIG_NETDEV_10000 is not set
# CONFIG_TR is not set
#
@@ -1085,68 +1016,7 @@
# CONFIG_GPIOLIB is not set
# CONFIG_W1 is not set
# CONFIG_POWER_SUPPLY is not set
-CONFIG_HWMON=y
-# CONFIG_HWMON_VID is not set
-# CONFIG_SENSORS_AD7414 is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7473 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_I5K_AMB is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_LM93 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_LM95241 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_VIA686A is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_VT8231 is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
+# CONFIG_HWMON is not set
# CONFIG_THERMAL is not set
# CONFIG_THERMAL_HWMON is not set
# CONFIG_WATCHDOG is not set
@@ -1193,7 +1063,7 @@
# CONFIG_AGP is not set
# CONFIG_DRM is not set
# CONFIG_VGASTATE is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=m
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
# CONFIG_FB is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
@@ -1460,21 +1330,19 @@
# CONFIG_EXT2_FS_XIP is not set
CONFIG_EXT3_FS=y
CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
-CONFIG_EXT3_FS_XATTR=y
-# CONFIG_EXT3_FS_POSIX_ACL is not set
-# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT3_FS_XATTR is not set
# CONFIG_EXT4_FS is not set
CONFIG_JBD=y
-CONFIG_FS_MBCACHE=y
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
+# CONFIG_FS_POSIX_ACL is not set
CONFIG_FILE_LOCKING=y
CONFIG_XFS_FS=m
# CONFIG_XFS_QUOTA is not set
# CONFIG_XFS_POSIX_ACL is not set
# CONFIG_XFS_RT is not set
# CONFIG_XFS_DEBUG is not set
+# CONFIG_GFS2_FS is not set
# CONFIG_OCFS2_FS is not set
# CONFIG_BTRFS_FS is not set
CONFIG_DNOTIFY=y
@@ -1546,7 +1414,7 @@
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=y
CONFIG_NFS_V3=y
-CONFIG_NFS_V3_ACL=y
+# CONFIG_NFS_V3_ACL is not set
CONFIG_NFS_V4=y
CONFIG_ROOT_NFS=y
CONFIG_NFSD=m
@@ -1556,7 +1424,6 @@
CONFIG_LOCKD=y
CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=m
-CONFIG_NFS_ACL_SUPPORT=y
CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=y
CONFIG_SUNRPC_GSS=y
@@ -1649,7 +1516,7 @@
#
# Kernel hacking
#
-# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINTK_TIME=y
CONFIG_ENABLE_WARN_DEPRECATED=y
CONFIG_ENABLE_MUST_CHECK=y
CONFIG_FRAME_WARN=1024
@@ -1832,8 +1699,6 @@
# Random Number Generation
#
# CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_CRYPTO_DEV_TALITOS is not set
+# CONFIG_CRYPTO_HW is not set
# CONFIG_PPC_CLOCK is not set
# CONFIG_VIRTUALIZATION is not set
--
Rogério Brito : rbrito@{mackenzie,ime.usp}.br : GPG key 1024D/7C2CAEB8
http://www.ime.usp.br/~rbrito : http://meusite.mackenzie.com.br/rbrito
Projects: algorithms.berlios.de : lame.sf.net : vrms.alioth.debian.org
^ permalink raw reply
* Re: [PATCH 1/3] IB/ehca: Replace vmalloc with kmalloc
From: Roland Dreier @ 2009-04-28 16:45 UTC (permalink / raw)
To: Stefan Roscher
Cc: fenkes, LKML, OF-EWG, LinuxPPC-Dev, raisch, alexschm,
stefan.roscher
In-Reply-To: <200904211716.45245.ossrosch@linux.vnet.ibm.com>
thanks, applied.
> From: Anton Blanchard <antonb at au1.ibm.com>
> Signed-off-by: Stefan Roscher <stefan.roscher at de.ibm.com>
please use '@' signs so these are real email addresses.
- R.
^ permalink raw reply
* Re: [PATCH 3/3] IB/ehca: Increment version number
From: Roland Dreier @ 2009-04-28 16:48 UTC (permalink / raw)
To: Stefan Roscher
Cc: fenkes, OF-EWG, LKML, LinuxPPC-Dev, raisch, alexschm,
stefan.roscher
In-Reply-To: <200904211718.16434.ossrosch@linux.vnet.ibm.com>
thanks, applied 2 & 3.
^ permalink raw reply
* [PATCH] powerpc: Update MPC5xxx and Xilinx Virtex maintainer entries
From: Grant Likely @ 2009-04-28 16:50 UTC (permalink / raw)
To: linuxppc-dev, linux-kernel, tnt
From: Grant Likely <grant.likely@secretlab.ca>
- Add git tree URLs
- Drop Sylvain from the 5xxx maintainers list. He hasn't been active
for a while now.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
MAINTAINERS | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index ef03abe..4a8d367 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3434,11 +3434,10 @@ L: linuxppc-dev@ozlabs.org
S: Maintained
LINUX FOR POWERPC EMBEDDED MPC5XXX
-P: Sylvain Munaut
-M: tnt@246tNt.com
P: Grant Likely
M: grant.likely@secretlab.ca
L: linuxppc-dev@ozlabs.org
+T: git git://git.secretlab.ca/git/linux-2.6.git
S: Maintained
LINUX FOR POWERPC EMBEDDED PPC4XX
@@ -3456,6 +3455,7 @@ P: Grant Likely
M: grant.likely@secretlab.ca
W: http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex
L: linuxppc-dev@ozlabs.org
+T: git git://git.secretlab.ca/git/linux-2.6.git
S: Maintained
LINUX FOR POWERPC EMBEDDED PPC8XX
^ permalink raw reply related
* [PATCH v2 10/15] powerpc: Remove unused __page_aligned macro.
From: Tim Abbott @ 2009-04-28 17:00 UTC (permalink / raw)
To: Sam Ravnborg
Cc: Denys Vlasenko, Jeff Arnold, Linux kernel mailing list,
Anders Kaseorg, linuxppc-dev, Paul Mundt, Paul Mackerras,
Tim Abbott, Linus Torvalds, Waseem Daher
In-Reply-To: <1240938062-3264-10-git-send-email-tabbott@mit.edu>
Signed-off-by: Tim Abbott <tabbott@mit.edu>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: linuxppc-dev@ozlabs.org
---
arch/powerpc/include/asm/page_64.h | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
index 043bfdf..20f9c74 100644
--- a/arch/powerpc/include/asm/page_64.h
+++ b/arch/powerpc/include/asm/page_64.h
@@ -152,14 +152,6 @@ do { \
#endif /* !CONFIG_HUGETLB_PAGE */
-#ifdef MODULE
-#define __page_aligned __attribute__((__aligned__(PAGE_SIZE)))
-#else
-#define __page_aligned \
- __attribute__((__aligned__(PAGE_SIZE), \
- __section__(".data.page_aligned")))
-#endif
-
#define VM_DATA_DEFAULT_FLAGS \
(test_thread_flag(TIF_32BIT) ? \
VM_DATA_DEFAULT_FLAGS32 : VM_DATA_DEFAULT_FLAGS64)
--
1.6.2.1
^ permalink raw reply related
* [PATCH v2 12/15] powerpc: Use macros for .data.page_aligned section.
From: Tim Abbott @ 2009-04-28 17:00 UTC (permalink / raw)
To: Sam Ravnborg
Cc: Denys Vlasenko, Jeff Arnold, Linux kernel mailing list,
Anders Kaseorg, linuxppc-dev, Paul Mundt, Paul Mackerras,
Tim Abbott, Linus Torvalds, Waseem Daher
In-Reply-To: <1240938062-3264-12-git-send-email-tabbott@mit.edu>
.data.page_aligned should not need a separate output section, so as
part of this cleanup I moved into the .data output section in the
linker scripts in order to eliminate unnecessary references to the
section name.
Note that this change moves the page-aligned data inside _edata.
Since it _is_ data, I suspect having page-aligned data outside _edata
was a bug. Please comment if it is not.
Signed-off-by: Tim Abbott <tabbott@mit.edu>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: linuxppc-dev@ozlabs.org
---
arch/powerpc/kernel/vdso.c | 2 +-
arch/powerpc/kernel/vdso32/vdso32_wrapper.S | 3 ++-
arch/powerpc/kernel/vdso64/vdso64_wrapper.S | 3 ++-
arch/powerpc/kernel/vmlinux.lds.S | 6 +-----
4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index ad06d5c..841910a 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -74,7 +74,7 @@ static int vdso_ready;
static union {
struct vdso_data data;
u8 page[PAGE_SIZE];
-} vdso_data_store __attribute__((__section__(".data.page_aligned")));
+} vdso_data_store __page_aligned_data
struct vdso_data *vdso_data = &vdso_data_store.data;
/* Format of the patch table */
diff --git a/arch/powerpc/kernel/vdso32/vdso32_wrapper.S b/arch/powerpc/kernel/vdso32/vdso32_wrapper.S
index 556f0ca..6e8f507 100644
--- a/arch/powerpc/kernel/vdso32/vdso32_wrapper.S
+++ b/arch/powerpc/kernel/vdso32/vdso32_wrapper.S
@@ -1,7 +1,8 @@
#include <linux/init.h>
+#include <linux/linkage.h>
#include <asm/page.h>
- .section ".data.page_aligned"
+ __PAGE_ALIGNED_DATA
.globl vdso32_start, vdso32_end
.balign PAGE_SIZE
diff --git a/arch/powerpc/kernel/vdso64/vdso64_wrapper.S b/arch/powerpc/kernel/vdso64/vdso64_wrapper.S
index 0529cb9..b8553d6 100644
--- a/arch/powerpc/kernel/vdso64/vdso64_wrapper.S
+++ b/arch/powerpc/kernel/vdso64/vdso64_wrapper.S
@@ -1,7 +1,8 @@
#include <linux/init.h>
+#include <linux/linkage.h>
#include <asm/page.h>
- .section ".data.page_aligned"
+ __PAGE_ALIGNED_DATA
.globl vdso64_start, vdso64_end
.balign PAGE_SIZE
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 47899b0..d3dcea0 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -221,6 +221,7 @@ SECTIONS
_sdata = .;
.data : AT(ADDR(.data) - LOAD_OFFSET) {
+ PAGE_ALIGNED_DATA
DATA_DATA
#ifdef CONFIG_PPC32
*(.sdata)
@@ -258,11 +259,6 @@ SECTIONS
*(.data.init_task)
}
- . = ALIGN(PAGE_SIZE);
- .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) {
- *(.data.page_aligned)
- }
-
.data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) {
*(.data.cacheline_aligned)
}
--
1.6.2.1
^ permalink raw reply related
* [PATCH v2 11/15] powerpc: share .data output section definition between 32 and 64 bits.
From: Tim Abbott @ 2009-04-28 17:00 UTC (permalink / raw)
To: Sam Ravnborg
Cc: Denys Vlasenko, Jeff Arnold, Linux kernel mailing list,
Anders Kaseorg, linuxppc-dev, Paul Mundt, Paul Mackerras,
Tim Abbott, Linus Torvalds, Waseem Daher
In-Reply-To: <1240938062-3264-11-git-send-email-tabbott@mit.edu>
Since upcoming changes will add several more common pieces of code
between the 32-bit and 64-bit powerpc architectures, it seems best to
unify these two blocks.
Signed-off-by: Tim Abbott <tabbott@mit.edu>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: linuxppc-dev@ozlabs.org
---
arch/powerpc/kernel/vmlinux.lds.S | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index a047a6c..47899b0 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -220,20 +220,19 @@ SECTIONS
. = ALIGN(PAGE_SIZE);
_sdata = .;
-#ifdef CONFIG_PPC32
.data : AT(ADDR(.data) - LOAD_OFFSET) {
DATA_DATA
+#ifdef CONFIG_PPC32
*(.sdata)
*(.got.plt) *(.got)
- }
#else
- .data : AT(ADDR(.data) - LOAD_OFFSET) {
- DATA_DATA
*(.data.rel*)
*(.toc1)
*(.branch_lt)
+#endif
}
+#ifndef CONFIG_PPC32
.opd : AT(ADDR(.opd) - LOAD_OFFSET) {
*(.opd)
}
--
1.6.2.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox