|
»
[git pull] Please pull powerpc.git merge branch
|
View:
New views
5 Messages
—
Rating Filter:
Alert me
|
 |
[git pull] Please pull powerpc.git merge branch
by Benjamin Herrenschmidt
::
Rate this Message:
Hi Linus !
Some of these might have been better in -rc4 or earlier, all my fault for having some backlog that I'm still going through. So we have some bug fixes (not necessarily regressions but also generally simple enough that I decided to go for 2.6.32 anyways) and a few very trivial Kconfig cleanups (outside of arch/powerpc but related to our symbols) from Kumar that could go anytime. The following changes since commit 964fe080d94db82a3268443e9b9ece4c60246414: Linus Torvalds (1): Merge git://git.kernel.org/.../rusty/linux-2.6-for-linus are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Andreas Schwab (2): powerpc: Fix segment mapping in vdso32 powerpc: Align vDSO base address Benjamin Herrenschmidt (1): powerpc/ppc64: Use preempt_schedule_irq instead of preempt_schedule Josh Boyer (1): powerpc/booke: Fix xmon single step on PowerPC Book-E Kumar Gala (7): powerpc: Add a Book-3E 64-bit defconfig powerpc: Fix compile errors found by new ppc64e_defconfig powerpc: Limit hugetlbfs support to PPC64 Book-3S machines powerpc: Limit memory hotplug support to PPC64 Book-3S machines powerpc: Minor cleanup to init/Kconfig powerpc: Minor cleanup to sound/ppc/Kconfig powerpc: Minor cleanup to lib/Kconfig.debug Michael Neuling (1): powerpc/perf_events: Fix priority of MSR HV vs PR bits Stephen Rothwell (1): powerpc/iseries: Remove compiler version dependent hack arch/powerpc/configs/ppc64e_defconfig | 2199 +++++++++++++++++++++++++++++++ arch/powerpc/kernel/entry_64.S | 41 +- arch/powerpc/kernel/pci_64.c | 2 + arch/powerpc/kernel/perf_event.c | 17 +- arch/powerpc/kernel/process.c | 2 +- arch/powerpc/kernel/setup_64.c | 1 - arch/powerpc/kernel/vdso.c | 11 +- arch/powerpc/kernel/vdso32/vdso32.lds.S | 4 +- arch/powerpc/platforms/iseries/Makefile | 11 +- arch/powerpc/platforms/iseries/dt.c | 56 +- arch/powerpc/xmon/xmon.c | 20 +- fs/Kconfig | 2 +- init/Kconfig | 2 +- lib/Kconfig.debug | 2 +- mm/Kconfig | 2 +- sound/ppc/Kconfig | 2 +- 16 files changed, 2294 insertions(+), 80 deletions(-) create mode 100644 arch/powerpc/configs/ppc64e_defconfig _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@... https://lists.ozlabs.org/listinfo/linuxppc-dev |
|
|
Re: [git pull] Please pull powerpc.git merge branch
by Benjamin Herrenschmidt
::
Rate this Message:
On Tue, 2009-10-27 at 18:11 +1100, Benjamin Herrenschmidt wrote:
> Hi Linus ! > > Some of these might have been better in -rc4 or earlier, all my fault > for having some backlog that I'm still going through. So we have some > bug fixes (not necessarily regressions but also generally simple > enough that I decided to go for 2.6.32 anyways) and a few very trivial > Kconfig cleanups (outside of arch/powerpc but related to our symbols) > from Kumar that could go anytime. I also had a pending pull request from Grant that I had forgotten. I added that, it's also minor stuff (device-tree and defconfig updates mostly and a couple of bug fixes). New consolidated pull request below. Cheers, Ben. The following changes since commit 964fe080d94db82a3268443e9b9ece4c60246414: Linus Torvalds (1): Merge git://git.kernel.org/.../rusty/linux-2.6-for-linus are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Andreas Schwab (2): powerpc: Fix segment mapping in vdso32 powerpc: Align vDSO base address Benjamin Herrenschmidt (2): powerpc/ppc64: Use preempt_schedule_irq instead of preempt_schedule Merge commit 'gcl/merge' into merge Grant Likely (1): powerpc/5200: Update defconfigs Heiko Schocher (2): mpc5200: support for the MAN mpc5200 based board uc101 mpc5200: support for the MAN mpc5200 based board mucmc52 Josh Boyer (1): powerpc/booke: Fix xmon single step on PowerPC Book-E Julia Lawall (1): drivers/serial/mpc52xx_uart.c: Use UPIO_MEM rather than SERIAL_IO_MEM Jérôme Pouiller (1): of: Remove nested function Kumar Gala (7): powerpc: Add a Book-3E 64-bit defconfig powerpc: Fix compile errors found by new ppc64e_defconfig powerpc: Limit hugetlbfs support to PPC64 Book-3S machines powerpc: Limit memory hotplug support to PPC64 Book-3S machines powerpc: Minor cleanup to init/Kconfig powerpc: Minor cleanup to sound/ppc/Kconfig powerpc: Minor cleanup to lib/Kconfig.debug Michael Neuling (1): powerpc/perf_events: Fix priority of MSR HV vs PR bits Stephen Rothwell (1): powerpc/iseries: Remove compiler version dependent hack Wolfram Sang (1): powerpc/boot/dts: drop obsolete 'fsl5200-clocking' arch/powerpc/boot/dts/cm5200.dts | 1 - arch/powerpc/boot/dts/digsy_mtc.dts | 1 - arch/powerpc/boot/dts/lite5200.dts | 2 - arch/powerpc/boot/dts/lite5200b.dts | 2 - arch/powerpc/boot/dts/media5200.dts | 2 - arch/powerpc/boot/dts/motionpro.dts | 1 - arch/powerpc/boot/dts/mpc5121ads.dts | 3 - arch/powerpc/boot/dts/mucmc52.dts | 332 ++++ arch/powerpc/boot/dts/pcm030.dts | 2 - arch/powerpc/boot/dts/pcm032.dts | 2 - arch/powerpc/boot/dts/tqm5200.dts | 1 - arch/powerpc/boot/dts/uc101.dts | 284 ++++ arch/powerpc/configs/52xx/cm5200_defconfig | 136 +- arch/powerpc/configs/52xx/lite5200b_defconfig | 153 ++- arch/powerpc/configs/52xx/motionpro_defconfig | 146 +- arch/powerpc/configs/52xx/pcm030_defconfig | 142 +- arch/powerpc/configs/52xx/tqm5200_defconfig | 148 +- arch/powerpc/configs/mpc5200_defconfig | 192 ++- arch/powerpc/configs/ppc64e_defconfig | 2199 +++++++++++++++++++++++++ arch/powerpc/kernel/entry_64.S | 41 +- arch/powerpc/kernel/pci_64.c | 2 + arch/powerpc/kernel/perf_event.c | 17 +- arch/powerpc/kernel/process.c | 2 +- arch/powerpc/kernel/setup_64.c | 1 - arch/powerpc/kernel/vdso.c | 11 +- arch/powerpc/kernel/vdso32/vdso32.lds.S | 4 +- arch/powerpc/platforms/52xx/mpc5200_simple.c | 2 + arch/powerpc/platforms/iseries/Makefile | 11 +- arch/powerpc/platforms/iseries/dt.c | 56 +- arch/powerpc/xmon/xmon.c | 20 +- drivers/of/of_mdio.c | 13 +- drivers/serial/mpc52xx_uart.c | 2 +- fs/Kconfig | 2 +- init/Kconfig | 2 +- lib/Kconfig.debug | 2 +- mm/Kconfig | 2 +- sound/ppc/Kconfig | 2 +- 37 files changed, 3490 insertions(+), 451 deletions(-) create mode 100644 arch/powerpc/boot/dts/mucmc52.dts create mode 100644 arch/powerpc/boot/dts/uc101.dts create mode 100644 arch/powerpc/configs/ppc64e_defconfig _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@... https://lists.ozlabs.org/listinfo/linuxppc-dev |
|
|
Re: [git pull] Please pull powerpc.git merge branch
by Linus Torvalds-3
::
Rate this Message:
On Tue, 27 Oct 2009, Benjamin Herrenschmidt wrote: > > Kumar Gala (7): > powerpc: Add a Book-3E 64-bit defconfig > powerpc: Fix compile errors found by new ppc64e_defconfig > powerpc: Limit hugetlbfs support to PPC64 Book-3S machines This is incredibly ugly. Why should the generic fs/Kconfig know about some random odd architecture detail like PPC_BOOK3S_64? I merged it, and noticed this because Super-H caused clashes by cleaning up. I would suggest PowerPC do the same. This patch is not signed-off, nor do I want any credit. But if it works on ppc, please send me something like this back. Linus --- arch/powerpc/Kconfig | 3 +++ fs/Kconfig | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 10a0a54..877db84 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -131,6 +131,9 @@ config PPC select GENERIC_ATOMIC64 if PPC32 select HAVE_PERF_EVENTS +config SYS_SUPPORTS_HUGETLBFS + defbool PPC_BOOK3S_64 + config EARLY_PRINTK bool default y diff --git a/fs/Kconfig b/fs/Kconfig index 2126078..64d44ef 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -135,7 +135,7 @@ config TMPFS_POSIX_ACL config HUGETLBFS bool "HugeTLB file system support" - depends on X86 || IA64 || PPC_BOOK3S_64 || SPARC64 || (S390 && 64BIT) || \ + depends on X86 || IA64 || SPARC64 || (S390 && 64BIT) || \ SYS_SUPPORTS_HUGETLBFS || BROKEN help hugetlbfs is a filesystem backing for HugeTLB pages, based on _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@... https://lists.ozlabs.org/listinfo/linuxppc-dev |
|
|
Re: [git pull] Please pull powerpc.git merge branch
by Benjamin Herrenschmidt
::
Rate this Message:
On Thu, 2009-10-29 at 09:14 -0700, Linus Torvalds wrote:
> > On Tue, 27 Oct 2009, Benjamin Herrenschmidt wrote: > > > > Kumar Gala (7): > > powerpc: Add a Book-3E 64-bit defconfig > > powerpc: Fix compile errors found by new ppc64e_defconfig > > powerpc: Limit hugetlbfs support to PPC64 Book-3S machines > > This is incredibly ugly. Why should the generic fs/Kconfig know about some > random odd architecture detail like PPC_BOOK3S_64? > > I merged it, and noticed this because Super-H caused clashes by cleaning > up. I would suggest PowerPC do the same. Right. I noticed the same thing yesterday and planned to do so today > This patch is not signed-off, nor do I want any credit. But if it works on > ppc, please send me something like this back. I'll stick something like that in my tree and send you a pull request. Cheers, Ben. > Linus > --- > arch/powerpc/Kconfig | 3 +++ > fs/Kconfig | 2 +- > 2 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig > index 10a0a54..877db84 100644 > --- a/arch/powerpc/Kconfig > +++ b/arch/powerpc/Kconfig > @@ -131,6 +131,9 @@ config PPC > select GENERIC_ATOMIC64 if PPC32 > select HAVE_PERF_EVENTS > > +config SYS_SUPPORTS_HUGETLBFS > + defbool PPC_BOOK3S_64 > + > config EARLY_PRINTK > bool > default y > diff --git a/fs/Kconfig b/fs/Kconfig > index 2126078..64d44ef 100644 > --- a/fs/Kconfig > +++ b/fs/Kconfig > @@ -135,7 +135,7 @@ config TMPFS_POSIX_ACL > > config HUGETLBFS > bool "HugeTLB file system support" > - depends on X86 || IA64 || PPC_BOOK3S_64 || SPARC64 || (S390 && 64BIT) || \ > + depends on X86 || IA64 || SPARC64 || (S390 && 64BIT) || \ > SYS_SUPPORTS_HUGETLBFS || BROKEN > help > hugetlbfs is a filesystem backing for HugeTLB pages, based on _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@... https://lists.ozlabs.org/listinfo/linuxppc-dev |
|
|
Re: [git pull] Please pull powerpc.git merge branch
by Benjamin Herrenschmidt
::
Rate this Message:
On Thu, 2009-10-29 at 09:14 -0700, Linus Torvalds wrote:
> > On Tue, 27 Oct 2009, Benjamin Herrenschmidt wrote: > > > > Kumar Gala (7): > > powerpc: Add a Book-3E 64-bit defconfig > > powerpc: Fix compile errors found by new ppc64e_defconfig > > powerpc: Limit hugetlbfs support to PPC64 Book-3S machines > > This is incredibly ugly. Why should the generic fs/Kconfig know about some > random odd architecture detail like PPC_BOOK3S_64? > > I merged it, and noticed this because Super-H caused clashes by cleaning > up. I would suggest PowerPC do the same. > > This patch is not signed-off, nor do I want any credit. But if it works on > ppc, please send me something like this back. Pushed this to my merge branch: (BTW. Where does this SYS_* form comes from ? We had ARCH_ now we have SYS_ * ? Oic... it's a mips thing... oh well no big deal) >From 5a1eb5c4453207ad9e7f6e8ca4f8db289743c993 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt <benh@...> Date: Fri, 30 Oct 2009 15:03:54 +1100 Subject: [PATCH] powerpc: Cleanup Kconfig selection of hugetlbfs support Signed-off-by: Benjamin Herrenschmidt <benh@...> --- arch/powerpc/Kconfig | 4 ++++ fs/Kconfig | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 10a0a54..2ba14e7 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -414,6 +414,10 @@ config ARCH_SPARSEMEM_DEFAULT config ARCH_POPULATES_NODE_MAP def_bool y +config SYS_SUPPORTS_HUGETLBFS + def_bool y + depends on PPC_BOOK3S_64 + source "mm/Kconfig" config ARCH_MEMORY_PROBE diff --git a/fs/Kconfig b/fs/Kconfig index 2126078..64d44ef 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -135,7 +135,7 @@ config TMPFS_POSIX_ACL config HUGETLBFS bool "HugeTLB file system support" - depends on X86 || IA64 || PPC_BOOK3S_64 || SPARC64 || (S390 && 64BIT) || \ + depends on X86 || IA64 || SPARC64 || (S390 && 64BIT) || \ SYS_SUPPORTS_HUGETLBFS || BROKEN help hugetlbfs is a filesystem backing for HugeTLB pages, based on -- 1.6.1.2.14.gf26b5 _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@... https://lists.ozlabs.org/listinfo/linuxppc-dev |
| Free embeddable forum powered by Nabble | Forum Help |
