diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/platforms/pseries/Makefile | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/ras.c (renamed from arch/ppc64/kernel/ras.c) | 11 | ||||
-rw-r--r-- | arch/ppc64/kernel/Makefile | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile index 9ebb34180a10..4c817304fc21 100644 --- a/arch/powerpc/platforms/pseries/Makefile +++ b/arch/powerpc/platforms/pseries/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | obj-y := pci.o lpar.o hvCall.o nvram.o reconfig.o \ | 1 | obj-y := pci.o lpar.o hvCall.o nvram.o reconfig.o \ |
2 | setup.o iommu.o | 2 | setup.o iommu.o ras.o |
3 | obj-$(CONFIG_SMP) += smp.o | 3 | obj-$(CONFIG_SMP) += smp.o |
4 | obj-$(CONFIG_IBMVIO) += vio.o | 4 | obj-$(CONFIG_IBMVIO) += vio.o |
diff --git a/arch/ppc64/kernel/ras.c b/arch/powerpc/platforms/pseries/ras.c index 41b97dc9cc0a..6562ff4b0a82 100644 --- a/arch/ppc64/kernel/ras.c +++ b/arch/powerpc/platforms/pseries/ras.c | |||
@@ -1,17 +1,16 @@ | |||
1 | /* | 1 | /* |
2 | * ras.c | ||
3 | * Copyright (C) 2001 Dave Engebretsen IBM Corporation | 2 | * Copyright (C) 2001 Dave Engebretsen IBM Corporation |
4 | * | 3 | * |
5 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
6 | * it under the terms of the GNU General Public License as published by | 5 | * it under the terms of the GNU General Public License as published by |
7 | * the Free Software Foundation; either version 2 of the License, or | 6 | * the Free Software Foundation; either version 2 of the License, or |
8 | * (at your option) any later version. | 7 | * (at your option) any later version. |
9 | * | 8 | * |
10 | * This program is distributed in the hope that it will be useful, | 9 | * This program is distributed in the hope that it will be useful, |
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | * GNU General Public License for more details. | 12 | * GNU General Public License for more details. |
14 | * | 13 | * |
15 | * You should have received a copy of the GNU General Public License | 14 | * You should have received a copy of the GNU General Public License |
16 | * along with this program; if not, write to the Free Software | 15 | * along with this program; if not, write to the Free Software |
17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
@@ -19,7 +18,7 @@ | |||
19 | 18 | ||
20 | /* Change Activity: | 19 | /* Change Activity: |
21 | * 2001/09/21 : engebret : Created with minimal EPOW and HW exception support. | 20 | * 2001/09/21 : engebret : Created with minimal EPOW and HW exception support. |
22 | * End Change Activity | 21 | * End Change Activity |
23 | */ | 22 | */ |
24 | 23 | ||
25 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
@@ -323,7 +322,7 @@ static int recover_mce(struct pt_regs *regs, struct rtas_error_log * err) | |||
323 | nonfatal = 1; | 322 | nonfatal = 1; |
324 | } | 323 | } |
325 | 324 | ||
326 | log_error((char *)err, ERR_TYPE_RTAS_LOG, !nonfatal); | 325 | log_error((char *)err, ERR_TYPE_RTAS_LOG, !nonfatal); |
327 | 326 | ||
328 | return nonfatal; | 327 | return nonfatal; |
329 | } | 328 | } |
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile index ce5c99db431f..cb6ac3d1a06f 100644 --- a/arch/ppc64/kernel/Makefile +++ b/arch/ppc64/kernel/Makefile | |||
@@ -29,7 +29,7 @@ ifneq ($(CONFIG_PPC_MERGE),y) | |||
29 | obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o | 29 | obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o |
30 | endif | 30 | endif |
31 | 31 | ||
32 | obj-$(CONFIG_PPC_PSERIES) += rtasd.o ras.o udbg_16550.o | 32 | obj-$(CONFIG_PPC_PSERIES) += rtasd.o udbg_16550.o |
33 | 33 | ||
34 | obj-$(CONFIG_PPC_BPA) += bpa_setup.o bpa_iommu.o bpa_nvram.o \ | 34 | obj-$(CONFIG_PPC_BPA) += bpa_setup.o bpa_iommu.o bpa_nvram.o \ |
35 | bpa_iic.o spider-pic.o | 35 | bpa_iic.o spider-pic.o |