Building a Kernel for the AMCC PPC440EP Bamboo Board
Hi, as I know there is no public available kernel tree with Bamboo support, you have to implement it yourself if you need it right now or just wait. Please correct me if I'm wrong. Best regards, -- Andriy Korud -Original Message- From: [EMAIL PROTECTED] on behalf of Zeighami, Roy Sent: Tue 3/1/2005 17:14 To: linuxppc-embedded at ozlabs.org Cc: Bawany, M. Ali (HPSL, Richardson/STT) Subject: Building a Kernel for the AMCC PPC440EP Bamboo Board Hello... I am trying to build a kernel image for the AMCC Bamboo PPC440EP board. My colleague downloaded a preview kit from MontaVista and that worked. However, I am trying to build a toolchain using crosstool and create a 2.6.x kernel image. However, when I type: make ARCH=ppc CROSS_COMPILE=powerpc-440-linux-gnu- menuconfig When I select 44x as the CPU type, I don't see Bamboo under machine type. Also, I tried building a 2.6.8 kernel image with Ebony but I can't get a successful build. I get the following errors: drivers/built-in.o(.text+0x3c7ec): In function `floppy_release_irq_and_dma': : undefined reference to `free_dma' drivers/built-in.o(.text+0x3dc14): In function `floppy_grab_irq_and_dma': : undefined reference to `request_dma' drivers/built-in.o(.text+0x3dddc): In function `floppy_grab_irq_and_dma': : undefined reference to `free_dma' make: *** [.tmp_vmlinux1] Error 1 However, the crosstool web site says that the following combo should build: gcc-3.4.2, glibc-2.3.3, binutils-2.15, linux-2.6.8 Any suggestions? Also, if the kernel source provided by Monta Vista is some special branch that isn't merged to kernel.org, does anyone know how to get the latest source from Monta Vista? Is one of these the version that I should be getting? zeighami at linux-2.6.8 $ rsync source.mvista.com:: mol Mac-On-Linux Source libmol Binary MOL Support Files yaboot Ethan's Yaboot Devel Tree yaboot-benh BenH's Experimental Yaboot Tree linuxppc_2_4LinuxPPC 2.4 BitKeeper tree, stable branch linuxppc-2.4LinuxPPC branch of the official 2.4 BitKeeper tree linuxppc_2_4_benh Ben's 2.4 Tree (aka, the PowerMac tree) linuxppc_2_4_devel LinuxPPC 2.4 BitKeeper tree, development branch linuxppc-2.5LinuxPPC 2.5 tree, based on Linus' BitKeeper tree linuxppc-2.5-benh Ben's 2.5 / 2.6 tree, based on the LinuxPPC 2.5 / 2.6 tree. linuxppc_2_2LinuxPPC 2.2 BitKeeper tree Thanks, Roy ___ Linuxppc-embedded mailing list Linuxppc-embedded at ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-embedded
Linux Dist
Hi all, we actually desgin a new PowerPC 440GX based Dev-Board. The Problem is, we have no Linux Distribution with embedded ppc440gx support. can someone give me links to ibm440gx linux distributions homepages?? greetz, Matthias
Custom serial driver
Hi! I'm currently porting a Linux kernel v2.4 to a custom PowerPC 603e-based board. For decompression and starting the kernel i use U-Boot. Since I have a non-standard serial communication-ship, I wrote a small driver for communication with U-Boot. Everything works fine but when I start the kernel, I get no output and it crashes somewhere. I guess I have to add a driver for the initial console to the kernel to see any output. But where do I have to add it? I searched the net for a good tutorial, but in vain. Can anyone tell me, where I have to put this driver or to get a nice tutorial? Greetings, Sebastian H?pe
Linux Dist
On Wed, 2 Mar 2005 10:22:39 +0100, Matthias Babylon m.babylon at hima.com wrote: Hi all, we actually desgin a new PowerPC 440GX based Dev-Board. The Problem is, we have no Linux Distribution with embedded ppc440gx support. can someone give me links to ibm440gx linux distributions homepages?? You could use gentoo, debian or build from scratch. You can get pretty much any PPC distribution to run. Need more information to give a good answer. What are you trying to do with your platform? Do you have memory or disk constraints? Do you need glibc or will uclibc be sufficient? Cheers, g.
Linux Dist
On Wed, Mar 02, 2005 at 10:22:39AM +0100, Matthias Babylon wrote: we actually desgin a new PowerPC 440GX based Dev-Board. The Problem is, we have no Linux Distribution with embedded ppc440gx support. can someone give me links to ibm440gx linux distributions homepages?? Full distribution (including pre-built 44x user-space) http://www.mvista.com If you need only Linux kernel, you can use official one, 440GX is supported in 2.6 - http://www.kernel.org -- Eugene
Linux Dist
On Wednesday 02 March 2005 10:22, Matthias Babylon wrote: Hi all, we actually desgin a new PowerPC 440GX based Dev-Board. The Problem is, we have no Linux Distribution with embedded ppc440gx support. can someone give me links to ibm440gx linux distributions homepages?? greetz, Matthias Hi, you might want to checkout ELinOS ;) See my signature. cheers, Gerhard -- Gerhard Jaeger gjaeger at sysgo.com SYSGO AG Embedded and Real-Time Software www.sysgo.com | www.elinos.com | www.pikeos.com | www.osek.de
Looking for prebuilt PPC board with miniPCI slot
Hi, we are looking for a embedded board with at least one miniPCI slot and Ethernet port with performance at AMCC 405EP at 333 level and Linux 2.6 support. Have anybody heard about something like this preferably in Europe? Thanks in advance, -- Andriy Korud software engineer, http://www.vector.com.pl
Looking for prebuilt PPC board with miniPCI slot
On Wed, 2005-03-02 at 14:18 +0100, Andriy Korud wrote: Hi, we are looking for a embedded board with at least one miniPCI slot and Ethernet port with performance at AMCC 405EP at 333 level and Linux 2.6 support. Have anybody heard about something like this preferably in Europe? shameless plug Hm, our EB405 only runs at 266 MHz, but there are other PowerPC-based modules you can stick onto our EBC2 carrier board. http://www.kontron.com/techlib/manuals/MAN-%20EBC2.pdf http://www.kontron.com/contact/ct-emea.cfm We also have an office in warsaw. /shameless plug :-) -- Stefan Nickl Kontron Modular Computers
[PATCH] emac: filter illegal frame sizes
On Sat, Feb 19, 2005 at 03:48:36AM -0500, Jeff Garzik wrote: Matt Porter wrote: Fix to drop frames that are too large for the current MTU. What is this fixing? You should be passing all frames up to the software stack. I was originally fixing the issue where the driver was only allocating rx buffers big enough for the configured MTU and got a bit overzealous. I pulled out the filtering hunks so we always allocate skbs large enough to handle a full size jumbo frame and pass everything up to the stack...new patch to follow. -Matt
[PATCH] emac: fix skb allocation for full-size jumbo frames
Sets jumbo frame handling based on MTU and allocates rx buffers
large to handle full-size jumbo frames.
Signed-off-by: Matt Porter mporter at kernel.crashing.org
= drivers/net/ibm_emac/ibm_emac_core.c 1.9 vs edited =
--- 1.9/drivers/net/ibm_emac/ibm_emac_core.c2005-01-20 13:25:10 -07:00
+++ edited/drivers/net/ibm_emac/ibm_emac_core.c 2005-02-18 09:23:08 -07:00
@@ -1041,7 +1056,7 @@
/* set speed (default is 10Mb) */
switch (speed) {
case SPEED_1000:
- mode_reg |= EMAC_M1_JUMBO_ENABLE | EMAC_M1_RFS_16K;
+ mode_reg |= EMAC_M1_RFS_16K;
if (fep-rgmii_dev) {
struct ibm_ocp_rgmii *rgmii =
RGMII_PRIV(fep-rgmii_dev);
@@ -1118,6 +1133,7 @@
{
struct ocp_enet_private *fep = dev-priv;
int old_mtu = dev-mtu;
+ unsigned long mode_reg;
emac_t *emacp = fep-emacp;
u32 em0mr0;
int i, full;
@@ -1160,10 +1176,17 @@
fep-rx_skb[i] = NULL;
}
- /* Set new rx_buffer_size and advertise new mtu */
- fep-rx_buffer_size =
- new_mtu + ENET_HEADER_SIZE + ENET_FCS_SIZE;
+ /* Set new rx_buffer_size, jumbo cap, and advertise new mtu */
+ mode_reg = in_be32(emacp-em0mr1);
+ if (new_mtu ENET_DEF_MTU_SIZE) {
+ mode_reg |= EMAC_M1_JUMBO_ENABLE;
+ fep-rx_buffer_size = EMAC_MAX_FRAME;
+ } else {
+ mode_reg = ~EMAC_M1_JUMBO_ENABLE;
+ fep-rx_buffer_size = ENET_DEF_BUF_SIZE;
+ }
dev-mtu = new_mtu;
+ out_be32(emacp-em0mr1, mode_reg);
/* Re-init rx skbs */
fep-rx_slot = 0;
= drivers/net/ibm_emac/ibm_emac_core.h 1.3 vs edited =
--- 1.3/drivers/net/ibm_emac/ibm_emac_core.h2005-02-08 22:24:52 -07:00
+++ edited/drivers/net/ibm_emac/ibm_emac_core.h 2005-02-18 09:30:07 -07:00
@@ -77,6 +77,8 @@
#define ENET_HEADER_SIZE 14
#define ENET_FCS_SIZE 4
+#define ENET_DEF_MTU_SIZE 1500
+#define ENET_DEF_BUF_SIZE (ENET_DEF_MTU_SIZE + ENET_HEADER_SIZE +
ENET_FCS_SIZE)
#define EMAC_MIN_FRAME 64
#define EMAC_MAX_FRAME 9018
#define EMAC_MIN_MTU (EMAC_MIN_FRAME - ENET_HEADER_SIZE -
ENET_FCS_SIZE)
[PATCH] ppc4xx_sgdma.c
On Mon, Feb 28, 2005 at 02:22:46AM +0100, Roger Larsson wrote: * Dynamic list length 1. short lists will not waste a whole page 2. no limit in list length * End of Transfer termination * Residue corrected Working with hardware (some tests remaining) You might want to copy/forward to Wolfgang since this patch is against the Denx 2.4 tree in ELDK. Since it doesn't mention the tree (most patches here are for linuxppc-2.4 or 2.6), he might have missed this thread. -Matt
Looking for prebuilt PPC board with miniPCI slot
Andriy Korud wrote: Hi, we are looking for a embedded board with at least one miniPCI slot and Ethernet port with performance at AMCC 405EP at 333 level and Linux 2.6 support. Have anybody heard about something like this preferably in Europe? Thanks in advance, -- Andriy Korud software engineer, http://www.vector.com.pl ___ Linuxppc-embedded mailing list Linuxppc-embedded at ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-embedded There is the Inrinsyc Cerf Cube 405EP http://www.intrinsyc.com/products/mob_ref_sys/cerfcube_405_ep/ . It has a MiniPCI slot and uses the 405EP . I don't know where it stands as far as 2.6 kernel support. I'm pretty sure nobody is actively supporting it with the current 2.4 kernel at this time though. You might have to call them to find out where software development stands. They might be able to make you some with a 333MHz part. -- Conn Clark * Give a man a match and you heat him for a moment. Set him on fire and you'll heat him for life. * Conn Clark Engineering Stooge clark at esteem.com Electronic Systems Technology Inc. www.esteem.com Stock Ticker Symbol ELST
PowerPC4xx Watchdog
On Thu, Feb 24, 2005 at 08:36:21AM +0900, Takeharu KATO wrote: Hi Are you looking for the old ppc405 watchdog driver that simply hooked into the generic PPC heartbeat facility? Or are you looking for a driver that utilizes the 4xx/booke hardware watchdog facility? I am looking for a driver that utilizes the 4xx/booke hardware watchdog facility. FYI, I wrote a driver uses 4xx/booke hardware watchdog. BTW, is hooking PPC heartbeat facility obsoleted? I see. The ppc_md.heartbeat facility isn't going anywhere as there are multiple users. It's possible to take the ppc405_wdt driver with a rename and minor cleanup have it be a generic timebase driven watchdog driver that is compliant with the familiar WD interface. What do you see as the advantage to having a watchdog driver that uses the booke hardware watchdog facility over a generic timebase driven driver? -Matt
linuxppc tree with mv64xxx included?
Ron Bianco wrote: I'm trying to locate the correct bitkeeper or other URL to get access to a linux 2.5 or 2.6 tree that includes the support for the marvell mv64xxx series chips. I've examined the emails in this list regarding related patches for clues, but am still confused. Tried bk://ppc.bkbits.net/linuxppc-2.5, but there is no marvell code. There is Marvell code in that tree. Look in drivers/net/mv64*, arch/ppc/syslib/mv* Some boards are already ported. See arch/ppc/platforms/* You'll also find the Marvell code in the mainline at bk://linux.bkbits.net/linux-2.6 We downloaded a 2.4.23 kernel tree directly from the marvell website, but it is lacking some things like i2c for marvell, that have been discussed here. Was further work, existing in some other tree, based on this? i2c and several other improvements are in queue. Check the archives for patches. The latest ethernet code can be obtained from bk://farnsworth.bkbits.net/linux-2.5-mv643xx-enet -- James Chapman PGP key : http://www.katalix.com/~jchapman/pgpkey.txt
linuxppc tree with mv64xxx included?
Thanks James and Mark, I should have searched it rather than looking in 2.4 tree locations. :-P We're going with 2.5 (2.6), but still getting familiar... many improvements over 2.4.23. Ron -Original Message- From: James Chapman [mailto:jchapman at katalix.com] Ron Bianco wrote: I'm trying to locate the correct bitkeeper or other URL to get access to a linux 2.5 or 2.6 tree that includes the support for the marvell mv64xxx series chips. I've examined the emails in this list regarding related patches for clues, but am still confused. Tried bk://ppc.bkbits.net/linuxppc-2.5, but there is no marvell code. There is Marvell code in that tree. Look in drivers/net/mv64*, arch/ppc/syslib/mv* Some boards are already ported. See arch/ppc/platforms/* You'll also find the Marvell code in the mainline at bk://linux.bkbits.net/linux-2.6 We downloaded a 2.4.23 kernel tree directly from the marvell website, but it is lacking some things like i2c for marvell, that have been discussed here. Was further work, existing in some other tree, based on this? i2c and several other improvements are in queue. Check the archives for patches. The latest ethernet code can be obtained from bk://farnsworth.bkbits.net/linux-2.5-mv643xx-enet -- James Chapman PGP key : http://www.katalix.com/~jchapman/pgpkey.txt
linuxppc tree with mv64xxx included?
On Wed, Mar 02, 2005 at 06:47:43PM +, James Chapman wrote: The latest ethernet code can be obtained from bk://farnsworth.bkbits.net/linux-2.5-mv643xx-enet Make that bk://dfarnsworth at bkbits.net/linux-2.5-mv643xx-enet -Dale
Building a Kernel for the AMCC PPC440EP Bamboo Board
On Tue, 1 March 2005 17:37:22 +0100, Gerhard Jaeger wrote: On Tuesday 01 March 2005 17:14, Zeighami, Roy wrote: When I select 44x as the CPU type, I don't see Bamboo under machine type. This won't work, as Bamboo BSP stuff is currently not added. Correct. Any suggestions? try to use ebony_defconfig Doesn't work, neither does ocotea. Both are able to display TUX! on the dot-matrix display, but panic before writing any serial output. /me has one of these beauties as well and will try to hack up support for it. If anyone has patches or suggestions, help is always appreciated. J?rn -- Simplicity is prerequisite for reliability. -- Edsger W. Dijkstra
PowerPC4xx Watchdog
Matt, [snip] What do you see as the advantage to having a watchdog driver that uses the booke hardware watchdog facility over a generic timebase driven driver? I would think the watchdog would be useful in cases that the normal decrementer exceptions gets disabled when MSR[EE] = 0. - kumar
[PATCH] ppc32: Add support for the Dallas 1553 RTC/NVRAM
Andrew,
This patch adds support for the Dallas 1553 RTC/NVRAM.
Signed-off-by: Kumar Gala kumar.gala at freescale.com
---
diff -Nru a/arch/ppc/syslib/todc_time.c b/arch/ppc/syslib/todc_time.c
--- a/arch/ppc/syslib/todc_time.c 2005-03-02 22:05:08 -06:00
+++ b/arch/ppc/syslib/todc_time.c 2005-03-02 22:05:08 -06:00
@@ -287,6 +287,7 @@
limit = 1;
switch (todc_info-rtc_type) {
+ case TODC_TYPE_DS1553:
case TODC_TYPE_DS1557:
case TODC_TYPE_DS1743:
case TODC_TYPE_DS1746: /* BAD HACK - FIX */
@@ -322,6 +323,7 @@
if (todc_info-rtc_type != TODC_TYPE_MC146818) {
switch (todc_info-rtc_type) {
+ case TODC_TYPE_DS1553:
case TODC_TYPE_DS1557:
case TODC_TYPE_DS1743:
case TODC_TYPE_DS1746: /* BAD HACK - FIX */
@@ -418,6 +420,7 @@
unsigned char save_control = 0, val;
switch (todc_info-rtc_type) {
+ case TODC_TYPE_DS1553:
case TODC_TYPE_DS1557:
case TODC_TYPE_DS1746: /* BAD HACK - FIX */
case TODC_TYPE_DS1747:
@@ -432,6 +435,7 @@
val = todc_read_val(addr);
switch (todc_info-rtc_type) {
+ case TODC_TYPE_DS1553:
case TODC_TYPE_DS1557:
case TODC_TYPE_DS1746: /* BAD HACK - FIX */
case TODC_TYPE_DS1747:
diff -Nru a/include/asm-ppc/todc.h b/include/asm-ppc/todc.h
--- a/include/asm-ppc/todc.h2005-03-02 22:05:08 -06:00
+++ b/include/asm-ppc/todc.h2005-03-02 22:05:08 -06:00
@@ -98,6 +98,7 @@
#define TODC_TYPE_PC97307 10 /* PC97307 internal RTC */
#define TODC_TYPE_DS1557 11 /* Dallas DS1557 RTC */
#define TODC_TYPE_DS17285 12 /* Dallas DS17285 RTC */
+#define TODC_TYPE_DS1553 13 /* Dallas DS1553 RTC */
#defineTODC_TYPE_MC146818 100 /* Leave room for
m48txx's */
/*
@@ -207,6 +208,28 @@
#defineTODC_TYPE_DS1501_FLAGS (TODC_TYPE_DS1501_NVRAM_SIZE +
0xff)
#defineTODC_TYPE_DS1501_NVRAM_ADDR_REG 0x10
#defineTODC_TYPE_DS1501_NVRAM_DATA_REG 0x13
+
+#defineTODC_TYPE_DS1553_NVRAM_SIZE 0x1ff0
+#defineTODC_TYPE_DS1553_SW_FLAGS 0
+#defineTODC_TYPE_DS1553_YEAR 0x1fff
+#defineTODC_TYPE_DS1553_MONTH 0x1ffe
+#defineTODC_TYPE_DS1553_DOM0x1ffd /* Day of Month
*/
+#defineTODC_TYPE_DS1553_DOW0x1ffc /* Day of Week
*/
+#defineTODC_TYPE_DS1553_HOURS 0x1ffb
+#defineTODC_TYPE_DS1553_MINUTES0x1ffa
+#defineTODC_TYPE_DS1553_SECONDS0x1ff9
+#defineTODC_TYPE_DS1553_CNTL_B 0x1ff9
+#defineTODC_TYPE_DS1553_CNTL_A 0x1ff8 /* control_a
R/W regs */
+#defineTODC_TYPE_DS1553_WATCHDOG 0x1ff7
+#defineTODC_TYPE_DS1553_INTERRUPTS 0x1ff6
+#defineTODC_TYPE_DS1553_ALARM_DATE 0x1ff5
+#defineTODC_TYPE_DS1553_ALARM_HOUR 0x1ff4
+#defineTODC_TYPE_DS1553_ALARM_MINUTES 0x1ff3
+#defineTODC_TYPE_DS1553_ALARM_SECONDS 0x1ff2
+#defineTODC_TYPE_DS1553_CENTURY0x1ff8
+#defineTODC_TYPE_DS1553_FLAGS 0x1ff0
+#defineTODC_TYPE_DS1553_NVRAM_ADDR_REG 0
+#defineTODC_TYPE_DS1553_NVRAM_DATA_REG 0
#defineTODC_TYPE_DS1557_NVRAM_SIZE 0x7fff0
#defineTODC_TYPE_DS1557_SW_FLAGS 0
[PATCH] ppc32: Add support to use the DS1553 RTC/NVRAM on MPC8555 CDS system
Andrew, This patch makes the MPC8555 CDS system utilize the DS1553 RTC/NVRAM. Signed-off-by: Kumar Gala kumar.gala at freescale.com --- diff -Nru a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c --- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c 2005-03-02 22:11:56 -06:00 +++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c 2005-03-02 22:11:56 -06:00 @@ -39,6 +39,7 @@ #include asm/page.h #include asm/atomic.h #include asm/time.h +#include asm/todc.h #include asm/io.h #include asm/machdep.h #include asm/prom.h @@ -304,6 +305,8 @@ } #endif /* CONFIG_PCI */ +TODC_ALLOC(); + /* * * Setup the architecture @@ -329,6 +332,13 @@ cds_pci_slot = ((cadmus[CM_CSR] 6) 0x3) + 1; printk(CDS Version = %x in PCI slot %d\n, cadmus[CM_VER], cds_pci_slot); + /* Setup TODC access */ + TODC_INIT(TODC_TYPE_DS1743, + 0, + 0, + ioremap(CDS_RTC_ADDR, CDS_RTC_SIZE), + 8); + /* Set loops_per_jiffy to a half-way reasonable value, for use until calibrate_delay gets called. */ loops_per_jiffy = freq / HZ; @@ -453,10 +463,14 @@ ppc_md.find_end_of_memory = mpc85xx_find_end_of_memory; - ppc_md.time_init = NULL; - ppc_md.set_rtc_time = NULL; - ppc_md.get_rtc_time = NULL; ppc_md.calibrate_decr = mpc85xx_calibrate_decr; + + ppc_md.time_init = todc_time_init; + ppc_md.set_rtc_time = todc_set_rtc_time; + ppc_md.get_rtc_time = todc_get_rtc_time; + + ppc_md.nvram_read_val = todc_direct_read_val; + ppc_md.nvram_write_val = todc_direct_write_val; #if defined(CONFIG_SERIAL_8250) defined(CONFIG_SERIAL_TEXT_DEBUG) ppc_md.progress = gen550_progress; diff -Nru a/arch/ppc/platforms/85xx/mpc85xx_cds_common.h b/arch/ppc/platforms/85xx/mpc85xx_cds_common.h --- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.h 2005-03-02 22:11:56 -06:00 +++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.h 2005-03-02 22:11:56 -06:00 @@ -33,6 +33,10 @@ #define CM_CSR (1) #define CM_RST (2) +/* CDS NVRAM/RTC */ +#define CDS_RTC_ADDR (0xf800) +#define CDS_RTC_SIZE (8 * 1024) + /* PCI config */ #define PCI1_CFG_ADDR_OFFSET (0x8000) #define PCI1_CFG_DATA_OFFSET (0x8004) diff -Nru a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile --- a/arch/ppc/syslib/Makefile 2005-03-02 22:11:56 -06:00 +++ b/arch/ppc/syslib/Makefile 2005-03-02 22:11:56 -06:00 @@ -99,4 +99,5 @@ ifeq ($(CONFIG_85xx),y) obj-$(CONFIG_PCI) += indirect_pci.o pci_auto.o endif +obj-$(CONFIG_MPC8555_CDS) += todc_time.o obj-$(CONFIG_PPC_MPC52xx) += mpc52xx_setup.o mpc52xx_pic.o
[PATCH] ppc32: Trivial bug fix in CRITICAL_EXCEPTION macro
Andrew, This patch fixes a trival bug in the CRITICAL_EXCEPTION macro Signed-off-by: Takeharu KATO kato.takeharu at jp.fujitsu.com Signed-off-by: Kumar Gala kumar.gala at freescale.com --- diff -Nru a/arch/ppc/kernel/head_booke.h b/arch/ppc/kernel/head_booke.h --- a/arch/ppc/kernel/head_booke.h 2005-03-02 22:20:28 -06:00 +++ b/arch/ppc/kernel/head_booke.h 2005-03-02 22:20:28 -06:00 @@ -194,8 +194,8 @@ CRITICAL_EXCEPTION_PROLOG; \ addir3,r1,STACK_FRAME_OVERHEAD; \ EXC_XFER_TEMPLATE(hdlr, n+2, (MSR_KERNEL ~(MSR_ME|MSR_DE|MSR_CE)), \ - NOCOPY, transfer_to_handler_full, \ - ret_from_except_full) + NOCOPY, crit_transfer_to_handler, \ + ret_from_crit_exc) #define MCHECK_EXCEPTION(n, label, hdlr) \ START_EXCEPTION(label); \
