* Please pull from 'for-2.6.24' branch
@ 2007-08-17 7:17 Kumar Gala
0 siblings, 0 replies; 15+ messages in thread
From: Kumar Gala @ 2007-08-17 7:17 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
Paul,
Please pull from 'for-2.6.24' branch of
master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for-2.6.24
It would be good to get these changes in ASAP as a baseline for other work
that might need to move other files over to asm-powerpc or other clean
ups.
to receive the following updates:
arch/powerpc/Makefile | 23
arch/powerpc/kernel/setup_32.c | 2
arch/powerpc/platforms/52xx/lite5200.c | 1
arch/powerpc/platforms/82xx/mpc82xx.c | 1
arch/powerpc/platforms/82xx/mpc82xx_ads.c | 1
arch/powerpc/platforms/82xx/pq2ads.h | 1
arch/powerpc/platforms/83xx/mpc832x_mds.c | 1
arch/powerpc/platforms/83xx/mpc834x_itx.c | 1
arch/powerpc/platforms/83xx/mpc834x_mds.c | 1
arch/powerpc/platforms/83xx/mpc836x_mds.c | 1
arch/powerpc/platforms/85xx/mpc85xx_cds.c | 1
arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1
arch/powerpc/platforms/8xx/m8xx_setup.c | 4
arch/powerpc/platforms/8xx/mpc86xads.h | 1
arch/powerpc/platforms/8xx/mpc86xads_setup.c | 1
arch/powerpc/platforms/8xx/mpc885ads.h | 1
arch/powerpc/platforms/8xx/mpc885ads_setup.c | 1
arch/powerpc/platforms/chrp/smp.c | 1
arch/powerpc/platforms/embedded6xx/ls_uart.c | 1
arch/powerpc/platforms/powermac/bootx_init.c | 1
include/asm-powerpc/8xx_immap.h | 564 ++++++++++++
include/asm-powerpc/commproc.h | 692 ++++++++++++++
include/asm-powerpc/cpm2.h | 1248 +++++++++++++++++++++++++++
include/asm-powerpc/gg2.h | 61 +
include/asm-powerpc/highmem.h | 135 ++
include/asm-powerpc/hydra.h | 102 ++
include/asm-powerpc/immap_cpm2.h | 648 ++++++++++++++
include/asm-powerpc/kgdb.h | 57 +
include/asm-powerpc/m8260_pci.h | 187 ++++
include/asm-powerpc/mpc10x.h | 180 +++
include/asm-powerpc/mpc52xx_psc.h | 191 ++++
31 files changed, 4075 insertions(+), 36 deletions(-)
Kumar Gala (3):
[POWERPC] Remove old includes from arch/ppc
[POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need
[POWERPC] Stop include asm-ppc when building ARCH=powerpc for ppc32
^ permalink raw reply [flat|nested] 15+ messages in thread
* Please pull from 'for-2.6.24' branch
@ 2007-08-17 13:46 Josh Boyer
2007-08-20 4:45 ` Paul Mackerras
0 siblings, 1 reply; 15+ messages in thread
From: Josh Boyer @ 2007-08-17 13:46 UTC (permalink / raw)
To: paulus; +Cc: linuxppc-dev
Hi Paul,
Please pull from the 'for-2.6.24' branch of
git://git.infradead.org/~jwboyer/powerpc.git for-2.6.24
It contains the patches sent in
http://ozlabs.org/pipermail/linuxppc-dev/2007-August/040512.html
rebased on top of your for-2.6.24 branch with the acks from David
included in the commits. Diffstat and shortlog below.
josh
arch/powerpc/Makefile | 2 +-
arch/powerpc/boot/44x.c | 85 ---
arch/powerpc/boot/44x.h | 5 +-
arch/powerpc/boot/4xx.c | 192 ++++++
arch/powerpc/boot/4xx.h | 21 +
arch/powerpc/boot/Makefile | 7 +-
arch/powerpc/boot/bamboo.c | 45 ++
arch/powerpc/boot/dcr.h | 13 +
arch/powerpc/boot/dts/bamboo.dts | 244 ++++++++
arch/powerpc/boot/ebony.c | 3 +-
arch/powerpc/boot/treeboot-bamboo.c | 27 +
arch/powerpc/configs/bamboo_defconfig | 775 ++++++++++++++++++++++++
arch/powerpc/kernel/Makefile | 2 +-
arch/powerpc/kernel/{head_4xx.S => head_40x.S} | 3 +-
arch/powerpc/kernel/ppc_ksyms.c | 2 +-
arch/powerpc/kernel/time.c | 2 +-
arch/powerpc/mm/{4xx_mmu.c => 40x_mmu.c} | 4 +-
arch/powerpc/mm/Makefile | 2 +-
arch/powerpc/platforms/{4xx => 40x}/Kconfig | 77 ---
arch/powerpc/platforms/{4xx => 40x}/Makefile | 0
arch/powerpc/platforms/44x/Kconfig | 15 +-
arch/powerpc/platforms/44x/Makefile | 1 +
arch/powerpc/platforms/44x/bamboo.c | 66 ++
arch/powerpc/platforms/Kconfig.cputype | 1 +
include/asm-powerpc/mmu-40x.h | 65 ++
include/asm-powerpc/mmu.h | 3 +
include/asm-powerpc/time.h | 2 +-
27 files changed, 1477 insertions(+), 187 deletions(-)
delete mode 100644 arch/powerpc/boot/44x.c
create mode 100644 arch/powerpc/boot/4xx.c
create mode 100644 arch/powerpc/boot/4xx.h
create mode 100644 arch/powerpc/boot/bamboo.c
create mode 100644 arch/powerpc/boot/dts/bamboo.dts
create mode 100644 arch/powerpc/boot/treeboot-bamboo.c
create mode 100644 arch/powerpc/configs/bamboo_defconfig
rename arch/powerpc/kernel/{head_4xx.S => head_40x.S} (100%)
rename arch/powerpc/mm/{4xx_mmu.c => 40x_mmu.c} (97%)
rename arch/powerpc/platforms/{4xx => 40x}/Kconfig (68%)
rename arch/powerpc/platforms/{4xx => 40x}/Makefile (100%)
create mode 100644 arch/powerpc/platforms/44x/bamboo.c
create mode 100644 include/asm-powerpc/mmu-40x.h
Josh Boyer (10):
Rename 4xx paths to 40x
4xx Kconfig cleanup
Rename 44x bootwrapper
4xx bootwrapper reworks
40x MMU
40x decrementer fixes
Fix 40x build
Bamboo DTS
Bamboo board support
Bamboo zImage wrapper
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Please pull from 'for-2.6.24' branch
2007-08-17 13:46 Please pull from 'for-2.6.24' branch Josh Boyer
@ 2007-08-20 4:45 ` Paul Mackerras
2007-08-20 12:33 ` Josh Boyer
2007-08-20 16:09 ` Timur Tabi
0 siblings, 2 replies; 15+ messages in thread
From: Paul Mackerras @ 2007-08-20 4:45 UTC (permalink / raw)
To: Josh Boyer; +Cc: linuxppc-dev
Josh Boyer writes:
> Josh Boyer (10):
> Rename 4xx paths to 40x
> 4xx Kconfig cleanup
> Rename 44x bootwrapper
> 4xx bootwrapper reworks
> 40x MMU
> 40x decrementer fixes
> Fix 40x build
> Bamboo DTS
> Bamboo board support
> Bamboo zImage wrapper
Could you re-do these with [POWERPC] at the start of the summary line?
Thanks,
Paul.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Please pull from 'for-2.6.24' branch
2007-08-20 4:45 ` Paul Mackerras
@ 2007-08-20 12:33 ` Josh Boyer
2007-08-20 16:09 ` Timur Tabi
1 sibling, 0 replies; 15+ messages in thread
From: Josh Boyer @ 2007-08-20 12:33 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
On Mon, 20 Aug 2007 14:45:25 +1000
Paul Mackerras <paulus@samba.org> wrote:
> Josh Boyer writes:
>
> > Josh Boyer (10):
> > Rename 4xx paths to 40x
> > 4xx Kconfig cleanup
> > Rename 44x bootwrapper
> > 4xx bootwrapper reworks
> > 40x MMU
> > 40x decrementer fixes
> > Fix 40x build
> > Bamboo DTS
> > Bamboo board support
> > Bamboo zImage wrapper
>
> Could you re-do these with [POWERPC] at the start of the summary line?
Yes, done. Git tree is updated:
Josh Boyer (10):
[POWERPC] Rename 4xx paths to 40x
[POWERPC] 4xx Kconfig cleanup
[POWERPC] Rename 44x bootwrapper
[POWERPC] 4xx bootwrapper reworks
[POWERPC] 40x MMU
[POWERPC] 40x decrementer fixes
[POWERPC] Fix 40x build
[POWERPC] Bamboo DTS
[POWERPC] Bamboo board support
[POWERPC] Bamboo zImage wrapper
josh
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Please pull from 'for-2.6.24' branch
2007-08-20 4:45 ` Paul Mackerras
2007-08-20 12:33 ` Josh Boyer
@ 2007-08-20 16:09 ` Timur Tabi
2007-08-20 17:40 ` Kumar Gala
2007-08-20 22:55 ` Paul Mackerras
1 sibling, 2 replies; 15+ messages in thread
From: Timur Tabi @ 2007-08-20 16:09 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
Paul Mackerras wrote:
> Could you re-do these with [POWERPC] at the start of the summary line?
Is this something new that you want done for all patches from now on?
--
Timur Tabi
Linux Kernel Developer @ Freescale
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Please pull from 'for-2.6.24' branch
2007-08-20 16:09 ` Timur Tabi
@ 2007-08-20 17:40 ` Kumar Gala
2007-08-20 22:55 ` Paul Mackerras
1 sibling, 0 replies; 15+ messages in thread
From: Kumar Gala @ 2007-08-20 17:40 UTC (permalink / raw)
To: Timur Tabi; +Cc: linuxppc-dev, Paul Mackerras
On Aug 20, 2007, at 11:09 AM, Timur Tabi wrote:
> Paul Mackerras wrote:
>
>> Could you re-do these with [POWERPC] at the start of the summary
>> line?
>
> Is this something new that you want done for all patches from now on?
I think for git tree pull requests this is desired. For patches it
doesn't matter.
- k
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Please pull from 'for-2.6.24' branch
2007-08-20 16:09 ` Timur Tabi
2007-08-20 17:40 ` Kumar Gala
@ 2007-08-20 22:55 ` Paul Mackerras
1 sibling, 0 replies; 15+ messages in thread
From: Paul Mackerras @ 2007-08-20 22:55 UTC (permalink / raw)
To: Timur Tabi; +Cc: linuxppc-dev
Timur Tabi writes:
> Is this something new that you want done for all patches from now on?
It's not necessary for patches posted to the mailing list, but people
putting commits into a git tree for me to pull need to do it. I have
hacked versions of git-apply{mbox,patch} that do it automatically.
Paul.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Please pull from 'for-2.6.24' branch
@ 2007-08-23 4:16 Kumar Gala
0 siblings, 0 replies; 15+ messages in thread
From: Kumar Gala @ 2007-08-23 4:16 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
Please pull from 'for-2.6.24' branch of
master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for-2.6.24
This has been rebased against your latest for-2.6.24 branch and includes
the removal of <asm/bootinfo.h> to drivers/macintosh/adb-iop.c.
All other driver related patches have been sent to their maintainers.
(IDE, MTD, NET).
I think this is as good as it gets.
to receive the following updates:
arch/powerpc/Makefile | 17
arch/powerpc/kernel/setup_32.c | 2
arch/powerpc/platforms/52xx/lite5200.c | 1
arch/powerpc/platforms/82xx/m82xx_pci.h | 2
arch/powerpc/platforms/82xx/mpc82xx.c | 1
arch/powerpc/platforms/82xx/mpc82xx_ads.c | 1
arch/powerpc/platforms/82xx/pq2ads.h | 1
arch/powerpc/platforms/83xx/mpc832x_mds.c | 1
arch/powerpc/platforms/83xx/mpc834x_itx.c | 1
arch/powerpc/platforms/83xx/mpc834x_mds.c | 1
arch/powerpc/platforms/83xx/mpc836x_mds.c | 1
arch/powerpc/platforms/85xx/mpc85xx_cds.c | 1
arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1
arch/powerpc/platforms/8xx/m8xx_setup.c | 4
arch/powerpc/platforms/8xx/mpc86xads.h | 1
arch/powerpc/platforms/8xx/mpc86xads_setup.c | 1
arch/powerpc/platforms/8xx/mpc885ads.h | 1
arch/powerpc/platforms/8xx/mpc885ads_setup.c | 1
arch/powerpc/platforms/chrp/gg2.h | 61 +
arch/powerpc/platforms/chrp/pci.c | 2
arch/powerpc/platforms/chrp/setup.c | 2
arch/powerpc/platforms/chrp/smp.c | 1
arch/powerpc/platforms/embedded6xx/linkstation.c | 3
arch/powerpc/platforms/embedded6xx/ls_uart.c | 4
arch/powerpc/platforms/embedded6xx/mpc10x.h | 180 +++
arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 1
arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.h | 21
arch/powerpc/platforms/powermac/bootx_init.c | 1
drivers/macintosh/adb-iop.c | 1
drivers/macintosh/ans-lcd.c | 3
drivers/macintosh/ans-lcd.h | 11
include/asm-powerpc/8xx_immap.h | 564 +++++++++
include/asm-powerpc/commproc.h | 692 ++++++++++++
include/asm-powerpc/cpm2.h | 1248 ++++++++++++++++++++++
include/asm-powerpc/highmem.h | 135 ++
include/asm-powerpc/hydra.h | 102 +
include/asm-powerpc/immap_cpm2.h | 648 +++++++++++
include/asm-powerpc/kgdb.h | 57 +
include/asm-powerpc/mpc52xx_psc.h | 191 +++
include/asm-ppc/ans-lcd.h | 11
40 files changed, 3900 insertions(+), 78 deletions(-)
Kumar Gala (3):
[POWERPC] Remove old includes from arch/ppc
[POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need
[POWERPC] Stop include asm-ppc when building ARCH=powerpc for ppc32
^ permalink raw reply [flat|nested] 15+ messages in thread
* Please pull from 'for-2.6.24' branch
@ 2007-09-05 2:07 Olof Johansson
0 siblings, 0 replies; 15+ messages in thread
From: Olof Johansson @ 2007-09-05 2:07 UTC (permalink / raw)
To: paulus; +Cc: linuxppc-dev
Paul,
Please pull from 'for-2.6.24' branch of
master.kernel.org:/pub/scm/linux/kernel/git/olof/pasemi.git for-2.6.24
to receive the following updates:
arch/powerpc/kernel/sysfs.c | 60 +++++++++++++++++
arch/powerpc/platforms/pasemi/idle.c | 8 ++
arch/powerpc/platforms/pasemi/pasemi.h | 4 -
arch/powerpc/platforms/pasemi/pci.c | 71 ++++++++++++++++++++
arch/powerpc/platforms/pasemi/setup.c | 112 +++++++++++++++++++++++++++++++--
include/asm-powerpc/reg.h | 48 ++++++++++----
6 files changed, 281 insertions(+), 22 deletions(-)
Olof Johansson (5):
[POWERPC] pasemi: add pasemi_pci_getcfgaddr()
[POWERPC] pasemi: Add workaround for erratum 5945
[POWERPC] pasemi: Export more SPRs to sysfs when CONFIG_DEBUG_KERNEL=y
[POWERPC] pasemi: Print more information at machine check
[POWERPC] pasemi: Move pasemi_idle_init() to late_initcall()
Patches also posted as replies to this email for general info.
Thanks,
Olof
^ permalink raw reply [flat|nested] 15+ messages in thread
* Please pull from 'for-2.6.24' branch
@ 2007-10-11 14:19 Kumar Gala
0 siblings, 0 replies; 15+ messages in thread
From: Kumar Gala @ 2007-10-11 14:19 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
Please pull from 'for-2.6.24' branch of
master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for-2.6.24
to receive the following updates:
arch/powerpc/boot/dts/mpc8272ads.dts | 2
arch/powerpc/boot/dts/mpc8541cds.dts | 36 ++++++
arch/powerpc/boot/dts/mpc8555cds.dts | 36 ++++++
arch/powerpc/boot/dts/mpc8560ads.dts | 82 +++++++-------
arch/powerpc/configs/mpc8560_ads_defconfig | 23 +++
arch/powerpc/platforms/85xx/Kconfig | 1
arch/powerpc/platforms/85xx/mpc8540_ads.h | 35 ------
arch/powerpc/platforms/85xx/mpc85xx_ads.c | 168 +++++++++++++++--------------
arch/powerpc/platforms/85xx/mpc85xx_ads.h | 60 ----------
arch/powerpc/platforms/85xx/mpc85xx_cds.c | 10 +
arch/powerpc/platforms/85xx/mpc85xx_cds.h | 43 -------
arch/powerpc/platforms/85xx/mpc85xx_ds.c | 1
arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1
include/asm-powerpc/cpm2.h | 4
include/asm-powerpc/fs_pd.h | 2
include/asm-powerpc/mpc85xx.h | 45 -------
16 files changed, 238 insertions(+), 311 deletions(-)
Kumar Gala (2):
[POWERPC] 85xx: Killed <asm/mpc85xx.h>
[POWERPC] 85xx: Enable FP emulation in MPC8560 ADS defconfig
Scott Wood (3):
[POWERPC] mpc8272ads: Remove muram from the CPM reg property.
[POWERPC] 85xx: Convert mpc8560ads to the new CPM binding.
[POWERPC] 85xx: Add cpm nodes for 8541/8555 CDS
^ permalink raw reply [flat|nested] 15+ messages in thread
* Please pull from 'for-2.6.24' branch
@ 2007-11-09 9:59 Kumar Gala
0 siblings, 0 replies; 15+ messages in thread
From: Kumar Gala @ 2007-11-09 9:59 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
Please pull from 'for-2.6.24' branch of
master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for-2.6.24
to receive the following updates:
arch/powerpc/Makefile | 3 +++
arch/powerpc/sysdev/cpm_common.c | 4 +---
include/asm-powerpc/tlbflush.h | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
Kumar Gala (2):
[POWERPC] Add -mno-spe for ARCH=powerpc builds
[POWERPC] Fix oops related to 4xx flush_tlb_page modification
Scott Wood (1):
[POWERPC] cpm: Fix a couple minor issues in cpm_common.c.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Please pull from 'for-2.6.24' branch
@ 2007-11-20 5:56 Kumar Gala
2007-11-20 15:52 ` Kim Phillips
0 siblings, 1 reply; 15+ messages in thread
From: Kumar Gala @ 2007-11-20 5:56 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
Please pull from 'for-2.6.24' branch of
master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for-2.6.24
to receive the following updates:
Documentation/powerpc/booting-without-of.txt | 5 -
arch/powerpc/boot/dts/mpc832x_mds.dts | 9 -
arch/powerpc/boot/dts/mpc8544ds.dts | 20 ++--
arch/powerpc/boot/dts/mpc8572ds.dts | 108 ++++++++++++++++++++---
arch/powerpc/boot/dts/mpc8641_hpcn.dts | 126 ++++++++++++++++++++++-----
arch/powerpc/platforms/83xx/mpc832x_mds.c | 7 -
arch/powerpc/platforms/83xx/mpc836x_mds.c | 31 ++++++
arch/powerpc/platforms/83xx/usb.c | 8 -
8 files changed, 254 insertions(+), 60 deletions(-)
Cyrill Gorcunov (1):
[POWERPC] Fix potential NULL dereference
Kim Phillips (4):
[POWERPC] 83xx: mpc832x mds: Fix board PHY reset code
[POWERPC] 83xx: Fix 2nd UCC entry in mpc832x_mds.dts
[POWERPC] Document rgmii-rxid and rgmii-txid phy-connection-types
[POWERPC] 83xx: Handle mpc8360 rev. 2.1 RGMII timing erratum
Kumar Gala (1):
[POWERPC] Fix device tree interrupt map for Freescale ULI1575 boards
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Please pull from 'for-2.6.24' branch
2007-11-20 5:56 Kumar Gala
@ 2007-11-20 15:52 ` Kim Phillips
0 siblings, 0 replies; 15+ messages in thread
From: Kim Phillips @ 2007-11-20 15:52 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev, Paul Mackerras
On Mon, 19 Nov 2007 23:56:23 -0600 (CST)
Kumar Gala <galak@kernel.crashing.org> wrote:
> Kim Phillips (4):
> [POWERPC] 83xx: mpc832x mds: Fix board PHY reset code
> [POWERPC] 83xx: Fix 2nd UCC entry in mpc832x_mds.dts
> [POWERPC] Document rgmii-rxid and rgmii-txid phy-connection-types
> [POWERPC] 83xx: Handle mpc8360 rev. 2.1 RGMII timing erratum
>
Hi Kumar,
thanks for applying these, here's one you missed:
http://patchwork.ozlabs.org/linuxppc/patch?id=14651
Kim
^ permalink raw reply [flat|nested] 15+ messages in thread
* Please pull from 'for-2.6.24' branch
@ 2007-12-06 19:15 Kumar Gala
0 siblings, 0 replies; 15+ messages in thread
From: Kumar Gala @ 2007-12-06 19:15 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Andrew Morton, linuxppc-dev, Paul Mackerras, chombourger
Please pull from 'for-2.6.24' branch of
master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for-2.6.24
to receive the following updates:
arch/powerpc/kernel/asm-offsets.c | 3 +--
arch/powerpc/kernel/head_32.S | 2 +-
arch/powerpc/kernel/head_40x.S | 2 +-
arch/powerpc/kernel/head_44x.S | 2 +-
arch/powerpc/kernel/head_fsl_booke.S | 2 +-
include/asm-powerpc/pgtable-ppc32.h | 5 +++++
6 files changed, 10 insertions(+), 6 deletions(-)
Kumar Gala (1):
[POWERPC] Fix swapper_pg_dir size when CONFIG_PTE_64BIT=y on FSL_BOOKE
commit bee86f14d51a5a9a3b1897e301da1e415df0ba23
Author: Kumar Gala <galak@kernel.crashing.org>
Date: Thu Dec 6 13:11:04 2007 -0600
[POWERPC] Fix swapper_pg_dir size when CONFIG_PTE_64BIT=y on FSL_BOOKE
The size of swapper_pg_dir is 8k instead of 4k when using 64-bit PTEs
(CONFIG_PTE_64BIT).
This was reported by Cedric Hombourger <chombourger@gmail.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index d67bcd8..ed083fe 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -326,8 +326,7 @@ int main(void)
DEFINE(VMALLOC_START_VSID, KERNEL_VSID(VMALLOC_START));
#endif
-#ifdef CONFIG_PPC64
DEFINE(PGD_TABLE_SIZE, PGD_TABLE_SIZE);
-#endif
+
return 0;
}
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index a5b13ae..0f4fac5 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -1311,7 +1311,7 @@ empty_zero_page:
.globl swapper_pg_dir
swapper_pg_dir:
- .space 4096
+ .space PGD_TABLE_SIZE
.globl intercept_table
intercept_table:
diff --git a/arch/powerpc/kernel/head_40x.S b/arch/powerpc/kernel/head_40x.S
index cfefc2d..8552e67 100644
--- a/arch/powerpc/kernel/head_40x.S
+++ b/arch/powerpc/kernel/head_40x.S
@@ -994,7 +994,7 @@ empty_zero_page:
.space 4096
.globl swapper_pg_dir
swapper_pg_dir:
- .space 4096
+ .space PGD_TABLE_SIZE
/* Stack for handling critical exceptions from kernel mode */
diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S
index 409db61..56aba84 100644
--- a/arch/powerpc/kernel/head_44x.S
+++ b/arch/powerpc/kernel/head_44x.S
@@ -722,7 +722,7 @@ empty_zero_page:
*/
.globl swapper_pg_dir
swapper_pg_dir:
- .space 8192
+ .space PGD_TABLE_SIZE
/* Reserved 4k for the critical exception stack & 4k for the machine
* check stack per CPU for kernel mode exceptions */
diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S
index 4b98227..7aecb39 100644
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -1035,7 +1035,7 @@ empty_zero_page:
.space 4096
.globl swapper_pg_dir
swapper_pg_dir:
- .space 4096
+ .space PGD_TABLE_SIZE
/* Reserved 4k for the critical exception stack & 4k for the machine
* check stack per CPU for kernel mode exceptions */
diff --git a/include/asm-powerpc/pgtable-ppc32.h b/include/asm-powerpc/pgtable-ppc32.h
index fea2d8f..d1332bb 100644
--- a/include/asm-powerpc/pgtable-ppc32.h
+++ b/include/asm-powerpc/pgtable-ppc32.h
@@ -86,6 +86,11 @@ extern int icache_44x_need_flush;
* entries per page directory level: our page-table tree is two-level, so
* we don't really have any PMD directory.
*/
+#ifndef __ASSEMBLY__
+#define PTE_TABLE_SIZE (sizeof(pte_t) << PTE_SHIFT)
+#define PGD_TABLE_SIZE (sizeof(pgd_t) << (32 - PGDIR_SHIFT))
+#endif /* __ASSEMBLY__ */
+
#define PTRS_PER_PTE (1 << PTE_SHIFT)
#define PTRS_PER_PMD 1
#define PTRS_PER_PGD (1 << (32 - PGDIR_SHIFT))
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Please pull from 'for-2.6.24' branch
@ 2007-12-14 5:04 Kumar Gala
0 siblings, 0 replies; 15+ messages in thread
From: Kumar Gala @ 2007-12-14 5:04 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev, Vitaly Bordug
Please pull from 'for-2.6.24' branch of
master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for-2.6.24
to receive the following updates:
arch/powerpc/configs/mpc8272_ads_defconfig | 6 +++---
arch/powerpc/configs/pq2fads_defconfig | 6 +++---
arch/powerpc/kernel/ppc_ksyms.c | 12 ------------
arch/powerpc/math-emu/op-2.h | 3 ++-
arch/powerpc/sysdev/cpm2_common.c | 3 +--
drivers/net/fs_enet/mac-scc.c | 2 +-
include/asm-powerpc/commproc.h | 3 ---
7 files changed, 10 insertions(+), 25 deletions(-)
Jochen Friedrich (2):
[POWERPC] Fix typo #ifdef -> #ifndef
[POWERPC] Kill non-existent symbols from ksyms and commproc.h
Liu Yu (1):
[POWERPC] Fix rounding bug in emulation for double float operating
Scott Wood (2):
[POWRPC] CPM2: Eliminate section mismatch warning in cpm2_reset().
[POWERPC] 82xx: mpc8272ads, pq2fads: Update defconfig with CONFIG_FS_ENET_MDIO_FCC
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2007-12-14 5:05 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-08-17 13:46 Please pull from 'for-2.6.24' branch Josh Boyer
2007-08-20 4:45 ` Paul Mackerras
2007-08-20 12:33 ` Josh Boyer
2007-08-20 16:09 ` Timur Tabi
2007-08-20 17:40 ` Kumar Gala
2007-08-20 22:55 ` Paul Mackerras
-- strict thread matches above, loose matches on Subject: below --
2007-12-14 5:04 Kumar Gala
2007-12-06 19:15 Kumar Gala
2007-11-20 5:56 Kumar Gala
2007-11-20 15:52 ` Kim Phillips
2007-11-09 9:59 Kumar Gala
2007-10-11 14:19 Kumar Gala
2007-09-05 2:07 Olof Johansson
2007-08-23 4:16 Kumar Gala
2007-08-17 7:17 Kumar Gala
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).