diff options
| author |   David Gibson <david@gibson.dropbear.id.au> | 2005-11-01 15:30:26 +1100 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2005-11-02 16:05:53 +1100 |
| commit | f11b7bd88f8b41f0986498ffa11ffff1c3e513ca (patch) | |
| tree | fbf92752f905946df5bedeffa37a0614bbf2aa86 | |
| parent | [PATCH] powerpc: Move dart.h (diff) | |
| download | linux-dev-f11b7bd88f8b41f0986498ffa11ffff1c3e513ca.tar.xz linux-dev-f11b7bd88f8b41f0986498ffa11ffff1c3e513ca.zip | |
[PATCH] powerpc: Move naca.h to platforms/iseries
These days, the NACA only exists on iSeries. Therefore, this patch
moves naca.h from include/asm-ppc64 to arch/powerpc/platforms/iseries.
There was one file including naca.h outside of platforms/iseries -
arch/ppc64/kernel/udbg_scc.c. However, that's obviously a hangover
from older days. The include is not necessary, so this patch simply
removes it.
Built and booted on iSeries, built for G5 (which uses udbg_scc.o).
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/platforms/iseries/lpardata.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/iseries/naca.h (renamed from include/asm-ppc64/naca.h) | 8 | ||||
| -rw-r--r-- | arch/powerpc/platforms/iseries/release_data.h | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/iseries/setup.c | 2 | ||||
| -rw-r--r-- | arch/ppc64/kernel/udbg_scc.c | 1 |
5 files changed, 7 insertions, 8 deletions
diff --git a/arch/powerpc/platforms/iseries/lpardata.c b/arch/powerpc/platforms/iseries/lpardata.c index ed2ffee6f731..e856947bd16d 100644 --- a/arch/powerpc/platforms/iseries/lpardata.c +++ b/arch/powerpc/platforms/iseries/lpardata.c @@ -13,7 +13,6 @@ #include <linux/bitops.h> #include <asm/processor.h> #include <asm/ptrace.h> -#include <asm/naca.h> #include <asm/abs_addr.h> #include <asm/iSeries/ItLpNaca.h> #include <asm/lppaca.h> @@ -23,6 +22,7 @@ #include <asm/iSeries/ItExtVpdPanel.h> #include <asm/iSeries/ItLpQueue.h> +#include "naca.h" #include "vpd_areas.h" #include "spcomm_area.h" #include "ipl_parms.h" diff --git a/include/asm-ppc64/naca.h b/arch/powerpc/platforms/iseries/naca.h index d2afe6447597..ab2372eb8d2e 100644 --- a/include/asm-ppc64/naca.h +++ b/arch/powerpc/platforms/iseries/naca.h @@ -1,7 +1,7 @@ -#ifndef _NACA_H -#define _NACA_H +#ifndef _PLATFORMS_ISERIES_NACA_H +#define _PLATFORMS_ISERIES_NACA_H -/* +/* * c 2001 PPC 64 Team, IBM Corp * * This program is free software; you can redistribute it and/or @@ -21,4 +21,4 @@ struct naca_struct { extern struct naca_struct naca; -#endif /* _NACA_H */ +#endif /* _PLATFORMS_ISERIES_NACA_H */ diff --git a/arch/powerpc/platforms/iseries/release_data.h b/arch/powerpc/platforms/iseries/release_data.h index c68b9c3e5caf..66189fd2e32d 100644 --- a/arch/powerpc/platforms/iseries/release_data.h +++ b/arch/powerpc/platforms/iseries/release_data.h @@ -24,7 +24,7 @@ * address of the OS's NACA). */ #include <asm/types.h> -#include <asm/naca.h> +#include "naca.h" /* * When we IPL a secondary partition, we will check if if the diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c index 06431e642533..7bc19a594cc6 100644 --- a/arch/powerpc/platforms/iseries/setup.c +++ b/arch/powerpc/platforms/iseries/setup.c @@ -41,7 +41,6 @@ #include <asm/firmware.h> #include <asm/time.h> -#include <asm/naca.h> #include <asm/paca.h> #include <asm/cache.h> #include <asm/sections.h> @@ -54,6 +53,7 @@ #include <asm/iSeries/HvLpEvent.h> #include <asm/iSeries/LparMap.h> +#include "naca.h" #include "setup.h" #include "irq.h" #include "vpd_areas.h" diff --git a/arch/ppc64/kernel/udbg_scc.c b/arch/ppc64/kernel/udbg_scc.c index c47fd6c63531..820c53551507 100644 --- a/arch/ppc64/kernel/udbg_scc.c +++ b/arch/ppc64/kernel/udbg_scc.c @@ -12,7 +12,6 @@ #include <linux/types.h> #include <asm/udbg.h> #include <asm/processor.h> -#include <asm/naca.h> #include <asm/io.h> #include <asm/prom.h> #include <asm/pmac_feature.h> |