* Re: [git pull] Please pull powerpc.git merge branch
From: Grant Likely @ 2008-07-28 22:56 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: Stephen Rothwell, akpm, Linus Torvalds, Linux Kernel list,
linuxppc-dev
In-Reply-To: <1217279736.11188.215.camel@pasglop>
On Tue, Jul 29, 2008 at 07:15:36AM +1000, Benjamin Herrenschmidt wrote:
> On Mon, 2008-07-28 at 09:06 -0700, Linus Torvalds wrote:
> >
> > On Tue, 29 Jul 2008, Stephen Rothwell wrote:
> > >
> > > It should be
> > >
> > > git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge
> > >
> > > Ben seems to have copied from one of Paul's pull requests.
> >
> > Ok, that one worked for me.
> >
> > Ben, I'm sure some day you'll get it right on the first try. We're all
> > cheering for you!
>
> Should I hang out with a brown paper bag on my head all day today ?
No, that's reserved for committing things to the top level Makefile for
no reason.
g.
^ permalink raw reply
* Writing to CPLD mapped to EBC Port of AMCC440EP
From: Henry Bausley @ 2008-07-28 23:40 UTC (permalink / raw)
To: linuxppc-embedded
[-- Attachment #1: Type: text/plain, Size: 6506 bytes --]
I am attempting to write to a CPLD mapped to the EBC port of a AMCC 440EP. When I attempt to write using an unsigned variable
ie. unsigned *pbase = (unsigned char *)ioremap64(0x8F000000,0x1000000);
I get a kernel access of bad area, sig: 11 fault. However, if I change to an unsigned char ie. unsigned char *pbase = (unsigned char *)ioremap64(0x8F000000,
0x1000000); The system doesn't crash. I need to write using an unsigned. Does any one have any ideas what I am doing wrong?
I am using 2.6.24 Xenomai Denx. 4.2. I am porting a working 2.6.14 project that was developed with FSM Labs RT Linux (now owned by WindRiver).
//-----------------------------------------------------------------------
// initialize module -- this what is called when you do insmod ./ubus.ko
//-----------------------------------------------------------------------
static int __init ubus_init_module (void)
{
int i;
unsigned ofs[20] =
{0x400000,0x400100,0x500000,0x500100,0x600000,0x600100,0x700000,0x700100,
0x608000,0x608100,0x708000,0x708100,0x610000,0x610100,0x710000,0x710100,
0x618000,0x618100,0x718000,0x718100};
unsigned *pbase = (unsigned *)ioremap64(0x8F000000,
0x1000000);
unsigned *p;
for( i = 0; i < 20;i++)
{
p = pbase + ofs[i] + 0x34;
*p = 0x25500;
printk(KERN_ALERT "p = %X\r\n",p);
}
iounmap(pbase);
PRINTK("initializing module ubus\n");
i = register_chrdev (UBUS_MAJOR, UBUS_NAME, &ubus_fops);
if (i != 0) return - EIO;
return 0;
}
-bash-3.2# insmod
ubus.ko
Oops: kernel access of bad area, sig: 11
[#1]
NIP: d1068054 LR: d1068038 CTR:
00000000
REGS: cf489d70 TRAP: 0300 Not tainted
(2.6.24.2)
MSR: 00029000 <EE,ME> CR: 08004022 XER:
00000004
DEAR: d61000d0, ESR:
00800000
TASK = cf45c410[309] 'insmod' THREAD:
cf488000
GPR00: d1068038 cf489e20 cf45c410 d5100000 d6100000 00000000 00000000
cf4467f8
GPR08: 000007f8 d1060000 8ffff000 00000000 28004028 1004950c 00000000
d509c1e4
GPR16: cffe1ce0 d5093a04 00000000 00000036 00000036 d5093310 c003cb00
d5081000
GPR24: 00000026 00000026 d5093464 cf489e28 d1
0664c4 00025500 00000026 d1066a60
NIP [d1068054] ubus_init_module+0x54/0x190
[ubus]
LR [d1068038] ubus_init_module+0x38/0x190
[ubus]
Call
Trace:
[cf489e20] [d1068038] ubus_init_module+0x38/0x190 [ubus]
(unreliable)
[cf489e90] [c003df74] sys_init_module
+0x174/0x15e0
[cf489f40] [c0001ac4] ret_from_syscall
+0x0/0x3c
Instruction
dump:
480000cd 3c808f00 3ca00100 38600000 480000cd 80810008 3fa00002
5484103a
7c841a14 3d20d106 63bd5500 3b8964c4 <93a400d0> 7c7e1b78 388400d0
7f83e378
Segmentation fault
-bash-3.2# insmod
ubus.ko
p = D5500034
p = D5500134
p = D5600034
p = D5600134
p = D5700034
p = D5700134
p = D5800034
p = D5800134
p = D5708034
p = D5708134
p = D5808034
p = D5808134
p = D5710034
p = D5710134
p = D5810034
p = D5810134
p = D5718034
p = D5718134
p = D5818034
p = D5818134
initializing module ubus
[-- Attachment #2: Type: text/html, Size: 25411 bytes --]
^ permalink raw reply
* linux-next: pci-current tree build failure
From: Stephen Rothwell @ 2008-07-29 0:52 UTC (permalink / raw)
To: Jesse Barnes
Cc: Benjamin, Ingo, Joerg Roedel, linuxppc-dev, linux-next,
Paul Mackerras, Molnar
Hi Jesse,
Today's linux-next build (powerpc ppc64_defconfig) failed like this:
arch/powerpc/kernel/iommu.c:54: error: static declaration of 'iommu_num_pages' follows non-static declaration
include/linux/iommu-helper.h:11: error: previous declaration of 'iommu_num_pages' was here
Caused by commit 3bc9f79ee1ddc913be0a6d3592036683ef8a3148 ("iommu: add
iommu_num_pages helper function") which introduced a global version of a
function that powerpc has a different version of. I am not sure that the
two do the same thing - in fact they don't since powerpc can have a 64k
page size and still need to use a 4k iommu pages. I applied the
patch below (which I personally hate :-))
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
>From ade341416a628800ad2a27ecd576238087290125 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 29 Jul 2008 10:47:59 +1000
Subject: [PATCH] powerpc: generic iommu helper fallout
Powerpc needs it own version of iommu_num_pages() since the iommu pages
may be a different size to the system pages.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/powerpc/kernel/iommu.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index 550a193..b147055 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -51,7 +51,7 @@ static int protect4gb = 1;
static void __iommu_free(struct iommu_table *, dma_addr_t, unsigned int);
-static inline unsigned long iommu_num_pages(unsigned long vaddr,
+static inline unsigned long ppc_iommu_num_pages(unsigned long vaddr,
unsigned long slen)
{
unsigned long npages;
@@ -325,7 +325,7 @@ int iommu_map_sg(struct device *dev, struct iommu_table *tbl,
}
/* Allocate iommu entries for that segment */
vaddr = (unsigned long) sg_virt(s);
- npages = iommu_num_pages(vaddr, slen);
+ npages = ppc_iommu_num_pages(vaddr, slen);
align = 0;
if (IOMMU_PAGE_SHIFT < PAGE_SHIFT && slen >= PAGE_SIZE &&
(vaddr & ~PAGE_MASK) == 0)
@@ -418,7 +418,7 @@ int iommu_map_sg(struct device *dev, struct iommu_table *tbl,
unsigned long vaddr, npages;
vaddr = s->dma_address & IOMMU_PAGE_MASK;
- npages = iommu_num_pages(s->dma_address, s->dma_length);
+ npages = ppc_iommu_num_pages(s->dma_address, s->dma_length);
__iommu_free(tbl, vaddr, npages);
s->dma_address = DMA_ERROR_CODE;
s->dma_length = 0;
@@ -452,7 +452,7 @@ void iommu_unmap_sg(struct iommu_table *tbl, struct scatterlist *sglist,
if (sg->dma_length == 0)
break;
- npages = iommu_num_pages(dma_handle, sg->dma_length);
+ npages = ppc_iommu_num_pages(dma_handle, sg->dma_length);
__iommu_free(tbl, dma_handle, npages);
sg = sg_next(sg);
}
@@ -584,7 +584,7 @@ dma_addr_t iommu_map_single(struct device *dev, struct iommu_table *tbl,
BUG_ON(direction == DMA_NONE);
uaddr = (unsigned long)vaddr;
- npages = iommu_num_pages(uaddr, size);
+ npages = ppc_iommu_num_pages(uaddr, size);
if (tbl) {
align = 0;
@@ -617,7 +617,7 @@ void iommu_unmap_single(struct iommu_table *tbl, dma_addr_t dma_handle,
BUG_ON(direction == DMA_NONE);
if (tbl) {
- npages = iommu_num_pages(dma_handle, size);
+ npages = ppc_iommu_num_pages(dma_handle, size);
iommu_free(tbl, dma_handle, npages);
}
}
--
1.5.6.3
^ permalink raw reply related
* Re: [PATCH 1/5] Move elfcorehdr_addr out of vmcore.c (Was: Re: [patch] crashdump: fix undefined reference to `elfcorehdr_addr')
From: Eric W. Biederman @ 2008-07-28 22:37 UTC (permalink / raw)
To: Vivek Goyal
Cc: Tony Luck, linux-ia64, Paul Mundt, kexec, linux-kernel,
linuxppc-dev, Terry Loftin, Simon Horman, Paul Mackerras,
Eric W. Biederman, Andrew Morton, Linus Torvalds, Ingo Molnar
In-Reply-To: <20080728211025.GA9985@redhat.com>
^ permalink raw reply
* Re: [PATCH 1/5] Move elfcorehdr_addr out of vmcore.c (Was: Re: [patch] crashdump: fix undefined reference to `elfcorehdr_addr')
From: Simon Horman @ 2008-07-29 1:22 UTC (permalink / raw)
To: Eric W. Biederman
Cc: Tony Luck, linux-ia64, kexec, linux-kernel, linuxppc-dev,
Terry Loftin, Paul Mundt, Paul Mackerras, Andrew Morton,
Linus Torvalds, Ingo Molnar, Vivek Goyal
In-Reply-To: <m1vdypfwxe.fsf@frodo.ebiederm.org>
On Mon, Jul 28, 2008 at 03:47:41PM -0700, Eric W. Biederman wrote:
> Vivek Goyal <vgoyal@redhat.com> writes:
>
> > Hi All,
> >
> > How does following series of patches look like. I have moved
> > elfcorehdr_addr out of vmcore.c and pushed it to arch dependent section
> > of crash dump to make sure that it can be worked with even when
> > CONFIG_PROC_VMCORE is disabled and CONFIG_CRASH_DUMP is enabled.
> >
> > I tested it on x86_64. Compile tested it on i386 and ppc64. ia64 and
> > sh versions are completely untested.
>
> Given the current state of the code:
> Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
>
> To process a kernel crash dump we pass the kernel elfcorehdr option,
> so testing to see if it was passed seems reasonable.
>
> In general I think this method of handling the problems with kdump is
> too brittle to live, but in the case of iommus we certainly need to do
> something different, and unfortunately iommus were not common on x86
> when the original code was merged so we have not handled them well.
Agreed, however these patches look like they really ought to be merged
into a single patch for the sake of bisect. As things stand, applying
the first patch will break the build on each architecture with an
architecture specific until the latter is applied.
--
Horms
^ permalink raw reply
* Corey J Ashford is out of the office.
From: Corey J Ashford @ 2008-07-29 2:04 UTC (permalink / raw)
To: linuxppc-embedded
[-- Attachment #1: Type: text/plain, Size: 134 bytes --]
I will be out of the office starting 07/28/2008 and will not return until
08/01/2008.
I will respond to your message when I return.
[-- Attachment #2: Type: text/html, Size: 171 bytes --]
^ permalink raw reply
* Re: linux-next: pci-current tree build failure
From: Jesse Barnes @ 2008-07-29 2:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Joerg Roedel, linuxppc-dev, linux-next, Paul Mackerras,
Ingo Molnar
In-Reply-To: <20080729105213.0ac2acbd.sfr@canb.auug.org.au>
On Monday, July 28, 2008 5:52 pm Stephen Rothwell wrote:
> Hi Jesse,
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>
> arch/powerpc/kernel/iommu.c:54: error: static declaration of
> 'iommu_num_pages' follows non-static declaration
> include/linux/iommu-helper.h:11: error: previous declaration of
> 'iommu_num_pages' was here
>
> Caused by commit 3bc9f79ee1ddc913be0a6d3592036683ef8a3148 ("iommu: add
> iommu_num_pages helper function") which introduced a global version of a
> function that powerpc has a different version of. I am not sure that the
> two do the same thing - in fact they don't since powerpc can have a 64k
> page size and still need to use a 4k iommu pages. I applied the
> patch below (which I personally hate :-))
Hopefully my ppc machine will arrive soon and I can build & test boot things
so this won't happen in the future.
Joerg, what do you think here?
Thanks,
Jesse
^ permalink raw reply
* Re: [PATCH 1/5] Move elfcorehdr_addr out of vmcore.c (Was: Re: [patch] crashdump: fix undefined reference to `elfcorehdr_addr')
From: Vivek Goyal @ 2008-07-29 2:28 UTC (permalink / raw)
To: Simon Horman
Cc: Tony Luck, linux-ia64, kexec, linux-kernel, linuxppc-dev,
Terry Loftin, Paul Mundt, Paul Mackerras, Eric W. Biederman,
Andrew Morton, Linus Torvalds, Ingo Molnar
In-Reply-To: <20080729012245.GI10434@verge.net.au>
On Tue, Jul 29, 2008 at 11:22:48AM +1000, Simon Horman wrote:
> On Mon, Jul 28, 2008 at 03:47:41PM -0700, Eric W. Biederman wrote:
> > Vivek Goyal <vgoyal@redhat.com> writes:
> >
> > > Hi All,
> > >
> > > How does following series of patches look like. I have moved
> > > elfcorehdr_addr out of vmcore.c and pushed it to arch dependent section
> > > of crash dump to make sure that it can be worked with even when
> > > CONFIG_PROC_VMCORE is disabled and CONFIG_CRASH_DUMP is enabled.
> > >
> > > I tested it on x86_64. Compile tested it on i386 and ppc64. ia64 and
> > > sh versions are completely untested.
> >
> > Given the current state of the code:
> > Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
> >
> > To process a kernel crash dump we pass the kernel elfcorehdr option,
> > so testing to see if it was passed seems reasonable.
> >
> > In general I think this method of handling the problems with kdump is
> > too brittle to live, but in the case of iommus we certainly need to do
> > something different, and unfortunately iommus were not common on x86
> > when the original code was merged so we have not handled them well.
>
> Agreed, however these patches look like they really ought to be merged
> into a single patch for the sake of bisect. As things stand, applying
> the first patch will break the build on each architecture with an
> architecture specific until the latter is applied.
That's a good point. I was not very sure because changes were in
different arches and I broke the patch. At the same time changes are
really miniscule in each arch.
So, for the sake of not breaking compilation for git-bisect, I will
generate a single patch tomorrow. (Until and unless somebody has an
objection).
Thanks
Vivek
>
> --
> Horms
^ permalink raw reply
* Re: [PATCH] powerpc/lpar - defer prefered console setup
From: Benjamin Herrenschmidt @ 2008-07-29 3:06 UTC (permalink / raw)
To: Bastian Blank; +Cc: linuxppc-dev, akpm, linux-kernel
In-Reply-To: <20080728185651.GA29530@wavehammer.waldi.eu.org>
On Mon, 2008-07-28 at 20:56 +0200, Bastian Blank wrote:
> Hi
>
> The powerpc lpar code adds a prefered console at a very early state,
> during arch_setup. This runs even before the console setup from the
> command line and takes preference.
>
> This patch moves the prefered console setup into an arch_initcall which
> runs later and allows the specification of the correct console on the
> command line. The udbg console remains as boot console.
>
> There is a different problem that the code does not pick up the correct
> console because it uses a part (4) of the lpar device number (30000004)
> instead of the correct index 1.
>
> Signed-off-by: Bastian Blank <waldi@debian.org>
Shouldn't it be a console_initcall() ?
Now, regarding the "different problem" I think it's even worse than
that, looking at the code there's some non sensical things in here...
add_preferred_console() argument is what gets compared to
console->index, right ? Now if you look at hvc_instantiate(),
it compares each "index" argument passed in to hvc_con_driver.index,
and that index argument passed from hvc_find_vtys() has strictly
nothing to do with the vtermno, it's purely the index of the node
found in order...
So I think the whole stuff is non-sensical and needs fixing.
Cheers,
Ben.
> diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
> index 9235c46..626290d 100644
> --- a/arch/powerpc/platforms/pseries/lpar.c
> +++ b/arch/powerpc/platforms/pseries/lpar.c
> @@ -57,6 +57,7 @@ extern void pSeries_find_serial_port(void);
>
>
> int vtermno; /* virtual terminal# for udbg */
> +static char *console_name;
>
> #define __ALIGNED__ __attribute__((__aligned__(sizeof(long))))
> static void udbg_hvsi_putc(char c)
> @@ -232,18 +233,24 @@ void __init find_udbg_vterm(void)
> udbg_putc = udbg_putcLP;
> udbg_getc = udbg_getcLP;
> udbg_getc_poll = udbg_getc_pollLP;
> - add_preferred_console("hvc", termno[0] & 0xff, NULL);
> + console_name = "hvc";
> } else if (of_device_is_compatible(stdout_node, "hvterm-protocol")) {
> - vtermno = termno[0];
> udbg_putc = udbg_hvsi_putc;
> udbg_getc = udbg_hvsi_getc;
> udbg_getc_poll = udbg_hvsi_getc_poll;
> - add_preferred_console("hvsi", termno[0] & 0xff, NULL);
> + console_name = "hvsi";
> }
> out:
> of_node_put(stdout_node);
> }
>
> +static void __init enable_vterm(void)
> +{
> + if (console_name)
> + add_preferred_console(console_name, vtermno, NULL);
> +}
> +arch_initcall(enable_vterm);
> +
> void vpa_init(int cpu)
> {
> int hwcpu = get_hard_smp_processor_id(cpu);
>
^ permalink raw reply
* Re: [PATCH 1/5] Move elfcorehdr_addr out of vmcore.c (Was: Re: [patch] crashdump: fix undefined reference to `elfcorehdr_addr')
From: Simon Horman @ 2008-07-29 3:26 UTC (permalink / raw)
To: Vivek Goyal
Cc: Tony Luck, linux-ia64, kexec, linux-kernel, linuxppc-dev,
Terry Loftin, Paul Mundt, Paul Mackerras, Eric W. Biederman,
Andrew Morton, Linus Torvalds, Ingo Molnar
In-Reply-To: <20080729022822.GA25975@redhat.com>
On Mon, Jul 28, 2008 at 10:28:22PM -0400, Vivek Goyal wrote:
> On Tue, Jul 29, 2008 at 11:22:48AM +1000, Simon Horman wrote:
> > On Mon, Jul 28, 2008 at 03:47:41PM -0700, Eric W. Biederman wrote:
> > > Vivek Goyal <vgoyal@redhat.com> writes:
> > >
> > > > Hi All,
> > > >
> > > > How does following series of patches look like. I have moved
> > > > elfcorehdr_addr out of vmcore.c and pushed it to arch dependent section
> > > > of crash dump to make sure that it can be worked with even when
> > > > CONFIG_PROC_VMCORE is disabled and CONFIG_CRASH_DUMP is enabled.
> > > >
> > > > I tested it on x86_64. Compile tested it on i386 and ppc64. ia64 and
> > > > sh versions are completely untested.
> > >
> > > Given the current state of the code:
> > > Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
> > >
> > > To process a kernel crash dump we pass the kernel elfcorehdr option,
> > > so testing to see if it was passed seems reasonable.
> > >
> > > In general I think this method of handling the problems with kdump is
> > > too brittle to live, but in the case of iommus we certainly need to do
> > > something different, and unfortunately iommus were not common on x86
> > > when the original code was merged so we have not handled them well.
> >
> > Agreed, however these patches look like they really ought to be merged
> > into a single patch for the sake of bisect. As things stand, applying
> > the first patch will break the build on each architecture with an
> > architecture specific until the latter is applied.
>
> That's a good point. I was not very sure because changes were in
> different arches and I broke the patch. At the same time changes are
> really miniscule in each arch.
I guessed that was why you split them up. But really the
per-arch change is very small.
> So, for the sake of not breaking compilation for git-bisect, I will
> generate a single patch tomorrow. (Until and unless somebody has an
> objection).
For combiled patch:
Acked-by: Simon Horman <horms@verge.net.au>
--
Horms
^ permalink raw reply
* Re: Corey J Ashford is out of the office.
From: Steve Iribarne (GMail) @ 2008-07-29 4:18 UTC (permalink / raw)
To: Corey J Ashford; +Cc: linuxppc-embedded
In-Reply-To: <OFA09EF64A.03A54876-ON87257495.000B6D2E-87257495.000B6D2F@us.ibm.com>
[-- Attachment #1: Type: text/plain, Size: 559 bytes --]
HAHAHAHAHAH.
This is funny.
Sorry rough night. Bad bugs today.
Glad I got this. Made me laugh.
On Mon, Jul 28, 2008 at 7:04 PM, Corey J Ashford <cjashfor@us.ibm.com>wrote:
> I will be out of the office starting 07/28/2008 and will not return until
> 08/01/2008.
>
> I will respond to your message when I return.
>
> _______________________________________________
> Linuxppc-embedded mailing list
> Linuxppc-embedded@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-embedded
>
--
/*
* Steve Iribarne
* Software Engineer
* (aka Grunt)
*/
[-- Attachment #2: Type: text/html, Size: 1076 bytes --]
^ permalink raw reply
* Re: [PATCH 3/5] ia64: Define elfcorehdr_addr in arch dependent section
From: Simon Horman @ 2008-07-29 4:42 UTC (permalink / raw)
To: Vivek Goyal
Cc: Tony Luck, linux-ia64, kexec, linux-kernel, linuxppc-dev,
Terry Loftin, Paul Mundt, Paul Mackerras, Eric W. Biederman,
Andrew Morton, Linus Torvalds, Ingo Molnar
In-Reply-To: <20080728211314.GC9985@redhat.com>
On Mon, Jul 28, 2008 at 05:13:14PM -0400, Vivek Goyal wrote:
>
> o Move elfcorehdr_addr definition in arch dependent crash dump file. This is
> equivalent to defining elfcorehdr_addr under CONFIG_CRASH_DUMP instead of
> CONFIG_PROC_VMCORE. This is needed by is_kdump_kernel() which can be
> used irrespective of the fact whether CONFIG_PROC_VMCORE is enabled or
> not.
>
> Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
> ---
>
> arch/ia64/kernel/setup.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff -puN arch/ia64/kernel/setup.c~fix-elfcorehdr_addr-parsing-ia64 arch/ia64/kernel/setup.c
> --- linux-2.6.27-pre-rc1/arch/ia64/kernel/setup.c~fix-elfcorehdr_addr-parsing-ia64 2008-07-28 12:16:40.000000000 -0400
> +++ linux-2.6.27-pre-rc1-root/arch/ia64/kernel/setup.c 2008-07-28 12:16:40.000000000 -0400
> @@ -478,7 +478,12 @@ static __init int setup_nomca(char *s)
> }
> early_param("nomca", setup_nomca);
>
> -#ifdef CONFIG_PROC_VMCORE
> +/*
> + * Note: elfcorehdr_addr is not just limited to vmcore. It is also used by
> + * is_kdump_kernel() to determine if we are booting after a panic. Hence
> + * ifdef it under CONFIG_CRASH_DUMP and not CONFIG_PROC_VMCORE.
> + */
> +#ifdef CONFIG_CRASH_DUMP
> /* elfcorehdr= specifies the location of elf core header
> * stored by the crashed kernel.
> */
> @@ -491,7 +496,9 @@ static int __init parse_elfcorehdr(char
> return 0;
> }
> early_param("elfcorehdr", parse_elfcorehdr);
> +#endif
>
> +#ifdef CONFIG_PROC_VMCORE
> int __init reserve_elfcorehdr(unsigned long *start, unsigned long *end)
> {
> unsigned long length;
> _
Hi Vivek,
I think that you also need the following in arch/ia64/kernel/crash_dump.c.
With this change your code compiles on ia64.
Signed-off-by: Simon Horman <horms@verge.net.au>
Index: linux-2.6/arch/ia64/kernel/crash_dump.c
===================================================================
--- linux-2.6.orig/arch/ia64/kernel/crash_dump.c 2008-07-29 14:06:57.000000000 +1000
+++ linux-2.6/arch/ia64/kernel/crash_dump.c 2008-07-29 14:09:55.000000000 +1000
@@ -8,10 +8,14 @@
#include <linux/errno.h>
#include <linux/types.h>
+#include <linux/crash_dump.h>
#include <asm/page.h>
#include <asm/uaccess.h>
+/* Stores the physical address of elf header of crash image. */
+unsigned long long elfcorehdr_addr = ELFCORE_ADDR_MAX;
+
/**
* copy_oldmem_page - copy one page from "oldmem"
* @pfn: page frame number to be copied
^ permalink raw reply
* libfdt: Forgot one function when cleaning the namespace
From: David Gibson @ 2008-07-29 4:51 UTC (permalink / raw)
To: Jon Loeliger; +Cc: linuxppc-dev
In commit b6d80a20fc293f3b995c3ce1a6744a5574192125, we renamed all
libfdt functions to be prefixed with fdt_ or _fdt_ to minimise the
chance of collisions with things from whatever package libfdt is
embedded in, pulled into the libfdt build via that environment's
libfdt_env.h.
Except... I missed one. This patch applies the same treatment to
_stringlist_contains(). While we're at it, also make it static since
it's only used in the same file.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Index: dtc/libfdt/fdt_ro.c
===================================================================
--- dtc.orig/libfdt/fdt_ro.c 2008-07-29 13:43:23.000000000 +1000
+++ dtc/libfdt/fdt_ro.c 2008-07-29 13:43:33.000000000 +1000
@@ -408,7 +408,8 @@ int fdt_node_offset_by_phandle(const voi
&phandle, sizeof(phandle));
}
-int _stringlist_contains(const char *strlist, int listlen, const char *str)
+static int _fdt_stringlist_contains(const char *strlist, int listlen,
+ const char *str)
{
int len = strlen(str);
const char *p;
@@ -434,7 +435,7 @@ int fdt_node_check_compatible(const void
prop = fdt_getprop(fdt, nodeoffset, "compatible", &len);
if (!prop)
return len;
- if (_stringlist_contains(prop, len, compatible))
+ if (_fdt_stringlist_contains(prop, len, compatible))
return 0;
else
return 1;
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply
* dtc: Remove unused lexer function
From: David Gibson @ 2008-07-29 4:51 UTC (permalink / raw)
To: Jon Loeliger; +Cc: linuxppc-dev
dtc does not use the input() function in flex. Apparently on some gcc
versions the unused function will cause warnings. Therefore, this
patch removes the function by using the 'noinput' option to flex.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Index: dtc/dtc-lexer.l
===================================================================
--- dtc.orig/dtc-lexer.l 2008-07-29 14:48:08.000000000 +1000
+++ dtc/dtc-lexer.l 2008-07-29 14:48:27.000000000 +1000
@@ -18,7 +18,7 @@
* USA
*/
-%option noyywrap nounput yylineno
+%option noyywrap nounput noinput yylineno
%x INCLUDE
%x BYTESTRING
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply
* [PATCH] powerpc: move include files to arch/powerpc/include/asm
From: Stephen Rothwell @ 2008-07-29 4:58 UTC (permalink / raw)
To: ppc-dev
from include/asm-powerpc
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
This is the git patch version if anyone wants the full thing, ask.
Built for all the top level powerpc configs. No (unexpected) errors.
Documentation/powerpc/booting-without-of.txt | 4 ++--
Documentation/powerpc/eeh-pci-error-recovery.txt | 2 +-
arch/powerpc/boot/io.h | 2 +-
.../powerpc/include/asm}/8253pit.h | 0
.../powerpc/include/asm}/8xx_immap.h | 0
.../powerpc/include/asm}/Kbuild | 0
.../powerpc/include/asm}/a.out.h | 0
.../powerpc/include/asm}/abs_addr.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/agp.h | 0
.../powerpc/include/asm}/asm-compat.h | 0
.../powerpc/include/asm}/atomic.h | 0
.../powerpc/include/asm}/auxvec.h | 0
.../powerpc/include/asm}/backlight.h | 0
.../powerpc/include/asm}/bitops.h | 0
.../powerpc/include/asm}/bootx.h | 0
.../powerpc/include/asm}/btext.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/bug.h | 0
.../powerpc/include/asm}/bugs.h | 0
.../powerpc/include/asm}/byteorder.h | 0
.../powerpc/include/asm}/cache.h | 0
.../powerpc/include/asm}/cacheflush.h | 0
.../powerpc/include/asm}/cell-pmu.h | 0
.../powerpc/include/asm}/cell-regs.h | 0
.../powerpc/include/asm}/checksum.h | 0
.../powerpc/include/asm}/clk_interface.h | 0
.../powerpc/include/asm}/code-patching.h | 0
.../powerpc/include/asm}/compat.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/cpm.h | 0
.../powerpc/include/asm}/cpm1.h | 0
.../powerpc/include/asm}/cpm2.h | 0
.../powerpc/include/asm}/cputable.h | 0
.../powerpc/include/asm}/cputhreads.h | 0
.../powerpc/include/asm}/cputime.h | 0
.../powerpc/include/asm}/current.h | 0
.../powerpc/include/asm}/dbdma.h | 0
.../powerpc/include/asm}/dcr-generic.h | 0
.../powerpc/include/asm}/dcr-mmio.h | 0
.../powerpc/include/asm}/dcr-native.h | 0
.../powerpc/include/asm}/dcr-regs.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/dcr.h | 0
.../powerpc/include/asm}/delay.h | 0
.../powerpc/include/asm}/device.h | 0
.../powerpc/include/asm}/div64.h | 0
.../powerpc/include/asm}/dma-mapping.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/dma.h | 0
.../powerpc/include/asm}/edac.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/eeh.h | 0
.../powerpc/include/asm}/eeh_event.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/elf.h | 0
.../powerpc/include/asm}/emergency-restart.h | 0
.../powerpc/include/asm}/errno.h | 0
.../powerpc/include/asm}/exception.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/fb.h | 0
.../powerpc/include/asm}/fcntl.h | 0
.../powerpc/include/asm}/feature-fixups.h | 0
.../powerpc/include/asm}/firmware.h | 0
.../powerpc/include/asm}/fixmap.h | 0
.../powerpc/include/asm}/floppy.h | 0
.../powerpc/include/asm}/fs_pd.h | 0
.../powerpc/include/asm}/fsl_gtm.h | 0
.../powerpc/include/asm}/fsl_lbc.h | 0
.../powerpc/include/asm}/ftrace.h | 0
.../powerpc/include/asm}/futex.h | 0
.../powerpc/include/asm}/gpio.h | 0
.../powerpc/include/asm}/grackle.h | 0
.../powerpc/include/asm}/hardirq.h | 0
.../powerpc/include/asm}/heathrow.h | 0
.../powerpc/include/asm}/highmem.h | 0
.../powerpc/include/asm}/hugetlb.h | 0
.../powerpc/include/asm}/hvcall.h | 0
.../powerpc/include/asm}/hvconsole.h | 0
.../powerpc/include/asm}/hvcserver.h | 0
.../powerpc/include/asm}/hw_irq.h | 0
.../powerpc/include/asm}/hydra.h | 0
.../powerpc/include/asm}/i8259.h | 0
.../powerpc/include/asm}/ibmebus.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/ide.h | 0
.../powerpc/include/asm}/immap_86xx.h | 0
.../powerpc/include/asm}/immap_cpm2.h | 0
.../powerpc/include/asm}/immap_qe.h | 2 --
.../powerpc/include/asm}/io-defs.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/io.h | 0
.../powerpc/include/asm}/ioctl.h | 0
.../powerpc/include/asm}/ioctls.h | 0
.../powerpc/include/asm}/iommu.h | 0
.../powerpc/include/asm}/ipcbuf.h | 0
.../powerpc/include/asm}/ipic.h | 2 --
.../asm-powerpc => arch/powerpc/include/asm}/irq.h | 0
.../powerpc/include/asm}/irq_regs.h | 0
.../powerpc/include/asm}/irqflags.h | 4 +---
.../powerpc/include/asm}/iseries/alpaca.h | 0
.../powerpc/include/asm}/iseries/hv_call.h | 0
.../powerpc/include/asm}/iseries/hv_call_event.h | 0
.../powerpc/include/asm}/iseries/hv_call_sc.h | 0
.../powerpc/include/asm}/iseries/hv_call_xm.h | 0
.../powerpc/include/asm}/iseries/hv_lp_config.h | 0
.../powerpc/include/asm}/iseries/hv_lp_event.h | 0
.../powerpc/include/asm}/iseries/hv_types.h | 0
.../powerpc/include/asm}/iseries/iommu.h | 0
.../powerpc/include/asm}/iseries/it_lp_queue.h | 0
.../powerpc/include/asm}/iseries/lpar_map.h | 0
.../powerpc/include/asm}/iseries/mf.h | 0
.../powerpc/include/asm}/iseries/vio.h | 0
.../powerpc/include/asm}/kdebug.h | 0
.../powerpc/include/asm}/kdump.h | 0
.../powerpc/include/asm}/kexec.h | 0
.../powerpc/include/asm}/keylargo.h | 0
.../powerpc/include/asm}/kgdb.h | 2 --
.../powerpc/include/asm}/kmap_types.h | 0
.../powerpc/include/asm}/kprobes.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/kvm.h | 0
.../powerpc/include/asm}/kvm_asm.h | 0
.../powerpc/include/asm}/kvm_host.h | 0
.../powerpc/include/asm}/kvm_para.h | 0
.../powerpc/include/asm}/kvm_ppc.h | 0
.../powerpc/include/asm}/libata-portmap.h | 0
.../powerpc/include/asm}/linkage.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/lmb.h | 0
.../powerpc/include/asm}/local.h | 0
.../powerpc/include/asm}/lppaca.h | 0
.../powerpc/include/asm}/lv1call.h | 0
.../powerpc/include/asm}/machdep.h | 0
.../powerpc/include/asm}/macio.h | 0
.../powerpc/include/asm}/mc146818rtc.h | 0
.../powerpc/include/asm}/mediabay.h | 0
.../powerpc/include/asm}/mman.h | 0
.../powerpc/include/asm}/mmu-40x.h | 0
.../powerpc/include/asm}/mmu-44x.h | 0
.../powerpc/include/asm}/mmu-8xx.h | 0
.../powerpc/include/asm}/mmu-fsl-booke.h | 0
.../powerpc/include/asm}/mmu-hash32.h | 0
.../powerpc/include/asm}/mmu-hash64.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/mmu.h | 0
.../powerpc/include/asm}/mmu_context.h | 0
.../powerpc/include/asm}/mmzone.h | 0
.../powerpc/include/asm}/module.h | 0
.../powerpc/include/asm}/mpc512x.h | 0
.../powerpc/include/asm}/mpc52xx.h | 0
.../powerpc/include/asm}/mpc52xx_psc.h | 0
.../powerpc/include/asm}/mpc6xx.h | 0
.../powerpc/include/asm}/mpc8260.h | 0
.../powerpc/include/asm}/mpc86xx.h | 0
.../powerpc/include/asm}/mpc8xx.h | 0
.../powerpc/include/asm}/mpic.h | 0
.../powerpc/include/asm}/msgbuf.h | 0
.../powerpc/include/asm}/mutex.h | 0
.../powerpc/include/asm}/nvram.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/of.h | 0
.../powerpc/include/asm}/of_device.h | 0
.../powerpc/include/asm}/of_platform.h | 0
.../powerpc/include/asm}/ohare.h | 0
.../powerpc/include/asm}/oprofile_impl.h | 0
.../powerpc/include/asm}/pSeries_reconfig.h | 0
.../powerpc/include/asm}/paca.h | 2 --
.../powerpc/include/asm}/page.h | 0
.../powerpc/include/asm}/page_32.h | 0
.../powerpc/include/asm}/page_64.h | 0
.../powerpc/include/asm}/param.h | 0
.../powerpc/include/asm}/parport.h | 0
.../powerpc/include/asm}/pasemi_dma.h | 0
.../powerpc/include/asm}/pci-bridge.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/pci.h | 0
.../powerpc/include/asm}/percpu.h | 0
.../powerpc/include/asm}/pgalloc-32.h | 0
.../powerpc/include/asm}/pgalloc-64.h | 0
.../powerpc/include/asm}/pgalloc.h | 0
.../powerpc/include/asm}/pgtable-4k.h | 0
.../powerpc/include/asm}/pgtable-64k.h | 0
.../powerpc/include/asm}/pgtable-ppc32.h | 0
.../powerpc/include/asm}/pgtable-ppc64.h | 2 +-
.../powerpc/include/asm}/pgtable.h | 0
.../powerpc/include/asm}/phyp_dump.h | 0
.../powerpc/include/asm}/pmac_feature.h | 0
.../powerpc/include/asm}/pmac_low_i2c.h | 0
.../powerpc/include/asm}/pmac_pfunc.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/pmc.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/pmi.h | 0
.../powerpc/include/asm}/poll.h | 0
.../powerpc/include/asm}/posix_types.h | 0
.../powerpc/include/asm}/ppc-pci.h | 0
.../powerpc/include/asm}/ppc4xx.h | 0
.../powerpc/include/asm}/ppc_asm.h | 0
.../powerpc/include/asm}/processor.h | 0
.../powerpc/include/asm}/prom.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/ps3.h | 0
.../powerpc/include/asm}/ps3av.h | 0
.../powerpc/include/asm}/ps3fb.h | 0
.../powerpc/include/asm}/ps3stor.h | 0
.../powerpc/include/asm}/ptrace.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/qe.h | 0
.../powerpc/include/asm}/qe_ic.h | 2 --
.../asm-powerpc => arch/powerpc/include/asm}/reg.h | 0
.../powerpc/include/asm}/reg_8xx.h | 0
.../powerpc/include/asm}/reg_booke.h | 0
.../powerpc/include/asm}/reg_fsl_emb.h | 0
.../powerpc/include/asm}/resource.h | 0
.../powerpc/include/asm}/rheap.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/rio.h | 0
.../powerpc/include/asm}/rtas.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/rtc.h | 0
.../powerpc/include/asm}/rwsem.h | 4 ++--
.../powerpc/include/asm}/scatterlist.h | 0
.../powerpc/include/asm}/seccomp.h | 0
.../powerpc/include/asm}/sections.h | 0
.../powerpc/include/asm}/sembuf.h | 0
.../powerpc/include/asm}/serial.h | 0
.../powerpc/include/asm}/setjmp.h | 0
.../powerpc/include/asm}/setup.h | 0
.../powerpc/include/asm}/shmbuf.h | 0
.../powerpc/include/asm}/shmparam.h | 0
.../powerpc/include/asm}/sigcontext.h | 0
.../powerpc/include/asm}/siginfo.h | 0
.../powerpc/include/asm}/signal.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/smp.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/smu.h | 0
.../powerpc/include/asm}/socket.h | 0
.../powerpc/include/asm}/sockios.h | 0
.../powerpc/include/asm}/sparsemem.h | 0
.../powerpc/include/asm}/spinlock.h | 0
.../powerpc/include/asm}/spinlock_types.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/spu.h | 0
.../powerpc/include/asm}/spu_csa.h | 0
.../powerpc/include/asm}/spu_info.h | 0
.../powerpc/include/asm}/spu_priv1.h | 0
.../powerpc/include/asm}/sstep.h | 0
.../powerpc/include/asm}/stat.h | 0
.../powerpc/include/asm}/statfs.h | 0
.../powerpc/include/asm}/string.h | 0
.../powerpc/include/asm}/suspend.h | 0
.../powerpc/include/asm}/synch.h | 0
.../powerpc/include/asm}/syscall.h | 0
.../powerpc/include/asm}/syscalls.h | 0
.../powerpc/include/asm}/systbl.h | 0
.../powerpc/include/asm}/system.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/tce.h | 0
.../powerpc/include/asm}/termbits.h | 0
.../powerpc/include/asm}/termios.h | 0
.../powerpc/include/asm}/thread_info.h | 0
.../powerpc/include/asm}/time.h | 0
.../powerpc/include/asm}/timex.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/tlb.h | 0
.../powerpc/include/asm}/tlbflush.h | 0
.../powerpc/include/asm}/topology.h | 0
.../powerpc/include/asm}/tsi108.h | 0
.../powerpc/include/asm}/tsi108_irq.h | 0
.../powerpc/include/asm}/tsi108_pci.h | 0
.../powerpc/include/asm}/types.h | 0
.../powerpc/include/asm}/uaccess.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/ucc.h | 0
.../powerpc/include/asm}/ucc_fast.h | 2 --
.../powerpc/include/asm}/ucc_slow.h | 0
.../powerpc/include/asm}/ucontext.h | 0
.../powerpc/include/asm}/udbg.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/uic.h | 2 --
.../powerpc/include/asm}/unaligned.h | 0
.../powerpc/include/asm}/uninorth.h | 0
.../powerpc/include/asm}/unistd.h | 0
.../powerpc/include/asm}/user.h | 0
.../powerpc/include/asm}/vdso.h | 0
.../powerpc/include/asm}/vdso_datapage.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/vga.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/vio.h | 0
.../powerpc/include/asm}/xilinx_intc.h | 0
.../powerpc/include/asm}/xmon.h | 0
.../asm-powerpc => arch/powerpc/include/asm}/xor.h | 0
arch/powerpc/mm/tlb_64.c | 2 +-
arch/powerpc/platforms/86xx/mpc86xx_smp.c | 2 +-
drivers/char/hvc_console.h | 2 +-
drivers/char/hvcs.c | 2 +-
drivers/infiniband/hw/ehca/ehca_reqs.c | 2 +-
include/asm-ia64/cputime.h | 2 +-
include/asm-x86/calgary.h | 2 +-
include/asm-x86/tce.h | 2 +-
273 files changed, 16 insertions(+), 32 deletions(-)
rename {include/asm-powerpc => arch/powerpc/include/asm}/8253pit.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/8xx_immap.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/Kbuild (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/a.out.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/abs_addr.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/agp.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/asm-compat.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/atomic.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/auxvec.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/backlight.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/bitops.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/bootx.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/btext.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/bug.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/bugs.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/byteorder.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/cache.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/cacheflush.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/cell-pmu.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/cell-regs.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/checksum.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/clk_interface.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/code-patching.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/compat.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/cpm.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/cpm1.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/cpm2.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/cputable.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/cputhreads.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/cputime.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/current.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/dbdma.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/dcr-generic.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/dcr-mmio.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/dcr-native.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/dcr-regs.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/dcr.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/delay.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/device.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/div64.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/dma-mapping.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/dma.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/edac.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/eeh.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/eeh_event.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/elf.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/emergency-restart.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/errno.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/exception.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/fb.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/fcntl.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/feature-fixups.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/firmware.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/fixmap.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/floppy.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/fs_pd.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/fsl_gtm.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/fsl_lbc.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/ftrace.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/futex.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/gpio.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/grackle.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/hardirq.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/heathrow.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/highmem.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/hugetlb.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/hvcall.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/hvconsole.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/hvcserver.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/hw_irq.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/hydra.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/i8259.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/ibmebus.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/ide.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/immap_86xx.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/immap_cpm2.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/immap_qe.h (99%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/io-defs.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/io.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/ioctl.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/ioctls.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/iommu.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/ipcbuf.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/ipic.h (99%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/irq.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/irq_regs.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/irqflags.h (93%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/alpaca.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_call.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_call_event.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_call_sc.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_call_xm.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_lp_config.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_lp_event.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_types.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/iommu.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/it_lp_queue.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/lpar_map.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/mf.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/vio.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/kdebug.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/kdump.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/kexec.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/keylargo.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/kgdb.h (98%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/kmap_types.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/kprobes.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/kvm.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/kvm_asm.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/kvm_host.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/kvm_para.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/kvm_ppc.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/libata-portmap.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/linkage.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/lmb.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/local.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/lppaca.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/lv1call.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/machdep.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/macio.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/mc146818rtc.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/mediabay.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/mman.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu-40x.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu-44x.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu-8xx.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu-fsl-booke.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu-hash32.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu-hash64.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu_context.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/mmzone.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/module.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/mpc512x.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/mpc52xx.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/mpc52xx_psc.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/mpc6xx.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/mpc8260.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/mpc86xx.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/mpc8xx.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/mpic.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/msgbuf.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/mutex.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/nvram.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/of.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/of_device.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/of_platform.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/ohare.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/oprofile_impl.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/pSeries_reconfig.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/paca.h (99%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/page.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/page_32.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/page_64.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/param.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/parport.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/pasemi_dma.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/pci-bridge.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/pci.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/percpu.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/pgalloc-32.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/pgalloc-64.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/pgalloc.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/pgtable-4k.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/pgtable-64k.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/pgtable-ppc32.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/pgtable-ppc64.h (99%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/pgtable.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/phyp_dump.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/pmac_feature.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/pmac_low_i2c.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/pmac_pfunc.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/pmc.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/pmi.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/poll.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/posix_types.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/ppc-pci.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/ppc4xx.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/ppc_asm.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/processor.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/prom.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/ps3.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/ps3av.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/ps3fb.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/ps3stor.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/ptrace.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/qe.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/qe_ic.h (99%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/reg.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/reg_8xx.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/reg_booke.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/reg_fsl_emb.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/resource.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/rheap.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/rio.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/rtas.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/rtc.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/rwsem.h (96%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/scatterlist.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/seccomp.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/sections.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/sembuf.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/serial.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/setjmp.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/setup.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/shmbuf.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/shmparam.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/sigcontext.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/siginfo.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/signal.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/smp.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/smu.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/socket.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/sockios.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/sparsemem.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/spinlock.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/spinlock_types.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/spu.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/spu_csa.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/spu_info.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/spu_priv1.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/sstep.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/stat.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/statfs.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/string.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/suspend.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/synch.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/syscall.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/syscalls.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/systbl.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/system.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/tce.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/termbits.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/termios.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/thread_info.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/time.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/timex.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/tlb.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/tlbflush.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/topology.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/tsi108.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/tsi108_irq.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/tsi108_pci.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/types.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/uaccess.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/ucc.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/ucc_fast.h (99%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/ucc_slow.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/ucontext.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/udbg.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/uic.h (95%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/unaligned.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/uninorth.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/unistd.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/user.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/vdso.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/vdso_datapage.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/vga.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/vio.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/xilinx_intc.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/xmon.h (100%)
rename {include/asm-powerpc => arch/powerpc/include/asm}/xor.h (100%)
diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt
index 928a79c..de4063c 100644
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
@@ -278,7 +278,7 @@ it with special cases.
a 64-bit platform.
d) request and get assigned a platform number (see PLATFORM_*
- constants in include/asm-powerpc/processor.h
+ constants in arch/powerpc/include/asm/processor.h
32-bit embedded kernels:
@@ -340,7 +340,7 @@ the block to RAM before passing it to the kernel.
---------
The kernel is entered with r3 pointing to an area of memory that is
- roughly described in include/asm-powerpc/prom.h by the structure
+ roughly described in arch/powerpc/include/asm/prom.h by the structure
boot_param_header:
struct boot_param_header {
diff --git a/Documentation/powerpc/eeh-pci-error-recovery.txt b/Documentation/powerpc/eeh-pci-error-recovery.txt
index df7afe4..9d4e33d 100644
--- a/Documentation/powerpc/eeh-pci-error-recovery.txt
+++ b/Documentation/powerpc/eeh-pci-error-recovery.txt
@@ -133,7 +133,7 @@ error. Given an arbitrary address, the routine
pci_get_device_by_addr() will find the pci device associated
with that address (if any).
-The default include/asm-powerpc/io.h macros readb(), inb(), insb(),
+The default arch/powerpc/include/asm/io.h macros readb(), inb(), insb(),
etc. include a check to see if the i/o read returned all-0xff's.
If so, these make a call to eeh_dn_check_failure(), which in turn
asks the firmware if the all-ff's value is the sign of a true EEH
diff --git a/arch/powerpc/boot/io.h b/arch/powerpc/boot/io.h
index ccaedae..7c09f48 100644
--- a/arch/powerpc/boot/io.h
+++ b/arch/powerpc/boot/io.h
@@ -6,7 +6,7 @@
/*
* Low-level I/O routines.
*
- * Copied from <file:include/asm-powerpc/io.h> (which has no copyright)
+ * Copied from <file:arch/powerpc/include/asm/io.h> (which has no copyright)
*/
static inline int in_8(const volatile unsigned char *addr)
{
diff --git a/include/asm-powerpc/8253pit.h b/arch/powerpc/include/asm/8253pit.h
similarity index 100%
rename from include/asm-powerpc/8253pit.h
rename to arch/powerpc/include/asm/8253pit.h
diff --git a/include/asm-powerpc/8xx_immap.h b/arch/powerpc/include/asm/8xx_immap.h
similarity index 100%
rename from include/asm-powerpc/8xx_immap.h
rename to arch/powerpc/include/asm/8xx_immap.h
diff --git a/include/asm-powerpc/Kbuild b/arch/powerpc/include/asm/Kbuild
similarity index 100%
rename from include/asm-powerpc/Kbuild
rename to arch/powerpc/include/asm/Kbuild
diff --git a/include/asm-powerpc/a.out.h b/arch/powerpc/include/asm/a.out.h
similarity index 100%
rename from include/asm-powerpc/a.out.h
rename to arch/powerpc/include/asm/a.out.h
diff --git a/include/asm-powerpc/abs_addr.h b/arch/powerpc/include/asm/abs_addr.h
similarity index 100%
rename from include/asm-powerpc/abs_addr.h
rename to arch/powerpc/include/asm/abs_addr.h
diff --git a/include/asm-powerpc/agp.h b/arch/powerpc/include/asm/agp.h
similarity index 100%
rename from include/asm-powerpc/agp.h
rename to arch/powerpc/include/asm/agp.h
diff --git a/include/asm-powerpc/asm-compat.h b/arch/powerpc/include/asm/asm-compat.h
similarity index 100%
rename from include/asm-powerpc/asm-compat.h
rename to arch/powerpc/include/asm/asm-compat.h
diff --git a/include/asm-powerpc/atomic.h b/arch/powerpc/include/asm/atomic.h
similarity index 100%
rename from include/asm-powerpc/atomic.h
rename to arch/powerpc/include/asm/atomic.h
diff --git a/include/asm-powerpc/auxvec.h b/arch/powerpc/include/asm/auxvec.h
similarity index 100%
rename from include/asm-powerpc/auxvec.h
rename to arch/powerpc/include/asm/auxvec.h
diff --git a/include/asm-powerpc/backlight.h b/arch/powerpc/include/asm/backlight.h
similarity index 100%
rename from include/asm-powerpc/backlight.h
rename to arch/powerpc/include/asm/backlight.h
diff --git a/include/asm-powerpc/bitops.h b/arch/powerpc/include/asm/bitops.h
similarity index 100%
rename from include/asm-powerpc/bitops.h
rename to arch/powerpc/include/asm/bitops.h
diff --git a/include/asm-powerpc/bootx.h b/arch/powerpc/include/asm/bootx.h
similarity index 100%
rename from include/asm-powerpc/bootx.h
rename to arch/powerpc/include/asm/bootx.h
diff --git a/include/asm-powerpc/btext.h b/arch/powerpc/include/asm/btext.h
similarity index 100%
rename from include/asm-powerpc/btext.h
rename to arch/powerpc/include/asm/btext.h
diff --git a/include/asm-powerpc/bug.h b/arch/powerpc/include/asm/bug.h
similarity index 100%
rename from include/asm-powerpc/bug.h
rename to arch/powerpc/include/asm/bug.h
diff --git a/include/asm-powerpc/bugs.h b/arch/powerpc/include/asm/bugs.h
similarity index 100%
rename from include/asm-powerpc/bugs.h
rename to arch/powerpc/include/asm/bugs.h
diff --git a/include/asm-powerpc/byteorder.h b/arch/powerpc/include/asm/byteorder.h
similarity index 100%
rename from include/asm-powerpc/byteorder.h
rename to arch/powerpc/include/asm/byteorder.h
diff --git a/include/asm-powerpc/cache.h b/arch/powerpc/include/asm/cache.h
similarity index 100%
rename from include/asm-powerpc/cache.h
rename to arch/powerpc/include/asm/cache.h
diff --git a/include/asm-powerpc/cacheflush.h b/arch/powerpc/include/asm/cacheflush.h
similarity index 100%
rename from include/asm-powerpc/cacheflush.h
rename to arch/powerpc/include/asm/cacheflush.h
diff --git a/include/asm-powerpc/cell-pmu.h b/arch/powerpc/include/asm/cell-pmu.h
similarity index 100%
rename from include/asm-powerpc/cell-pmu.h
rename to arch/powerpc/include/asm/cell-pmu.h
diff --git a/include/asm-powerpc/cell-regs.h b/arch/powerpc/include/asm/cell-regs.h
similarity index 100%
rename from include/asm-powerpc/cell-regs.h
rename to arch/powerpc/include/asm/cell-regs.h
diff --git a/include/asm-powerpc/checksum.h b/arch/powerpc/include/asm/checksum.h
similarity index 100%
rename from include/asm-powerpc/checksum.h
rename to arch/powerpc/include/asm/checksum.h
diff --git a/include/asm-powerpc/clk_interface.h b/arch/powerpc/include/asm/clk_interface.h
similarity index 100%
rename from include/asm-powerpc/clk_interface.h
rename to arch/powerpc/include/asm/clk_interface.h
diff --git a/include/asm-powerpc/code-patching.h b/arch/powerpc/include/asm/code-patching.h
similarity index 100%
rename from include/asm-powerpc/code-patching.h
rename to arch/powerpc/include/asm/code-patching.h
diff --git a/include/asm-powerpc/compat.h b/arch/powerpc/include/asm/compat.h
similarity index 100%
rename from include/asm-powerpc/compat.h
rename to arch/powerpc/include/asm/compat.h
diff --git a/include/asm-powerpc/cpm.h b/arch/powerpc/include/asm/cpm.h
similarity index 100%
rename from include/asm-powerpc/cpm.h
rename to arch/powerpc/include/asm/cpm.h
diff --git a/include/asm-powerpc/cpm1.h b/arch/powerpc/include/asm/cpm1.h
similarity index 100%
rename from include/asm-powerpc/cpm1.h
rename to arch/powerpc/include/asm/cpm1.h
diff --git a/include/asm-powerpc/cpm2.h b/arch/powerpc/include/asm/cpm2.h
similarity index 100%
rename from include/asm-powerpc/cpm2.h
rename to arch/powerpc/include/asm/cpm2.h
diff --git a/include/asm-powerpc/cputable.h b/arch/powerpc/include/asm/cputable.h
similarity index 100%
rename from include/asm-powerpc/cputable.h
rename to arch/powerpc/include/asm/cputable.h
diff --git a/include/asm-powerpc/cputhreads.h b/arch/powerpc/include/asm/cputhreads.h
similarity index 100%
rename from include/asm-powerpc/cputhreads.h
rename to arch/powerpc/include/asm/cputhreads.h
diff --git a/include/asm-powerpc/cputime.h b/arch/powerpc/include/asm/cputime.h
similarity index 100%
rename from include/asm-powerpc/cputime.h
rename to arch/powerpc/include/asm/cputime.h
diff --git a/include/asm-powerpc/current.h b/arch/powerpc/include/asm/current.h
similarity index 100%
rename from include/asm-powerpc/current.h
rename to arch/powerpc/include/asm/current.h
diff --git a/include/asm-powerpc/dbdma.h b/arch/powerpc/include/asm/dbdma.h
similarity index 100%
rename from include/asm-powerpc/dbdma.h
rename to arch/powerpc/include/asm/dbdma.h
diff --git a/include/asm-powerpc/dcr-generic.h b/arch/powerpc/include/asm/dcr-generic.h
similarity index 100%
rename from include/asm-powerpc/dcr-generic.h
rename to arch/powerpc/include/asm/dcr-generic.h
diff --git a/include/asm-powerpc/dcr-mmio.h b/arch/powerpc/include/asm/dcr-mmio.h
similarity index 100%
rename from include/asm-powerpc/dcr-mmio.h
rename to arch/powerpc/include/asm/dcr-mmio.h
diff --git a/include/asm-powerpc/dcr-native.h b/arch/powerpc/include/asm/dcr-native.h
similarity index 100%
rename from include/asm-powerpc/dcr-native.h
rename to arch/powerpc/include/asm/dcr-native.h
diff --git a/include/asm-powerpc/dcr-regs.h b/arch/powerpc/include/asm/dcr-regs.h
similarity index 100%
rename from include/asm-powerpc/dcr-regs.h
rename to arch/powerpc/include/asm/dcr-regs.h
diff --git a/include/asm-powerpc/dcr.h b/arch/powerpc/include/asm/dcr.h
similarity index 100%
rename from include/asm-powerpc/dcr.h
rename to arch/powerpc/include/asm/dcr.h
diff --git a/include/asm-powerpc/delay.h b/arch/powerpc/include/asm/delay.h
similarity index 100%
rename from include/asm-powerpc/delay.h
rename to arch/powerpc/include/asm/delay.h
diff --git a/include/asm-powerpc/device.h b/arch/powerpc/include/asm/device.h
similarity index 100%
rename from include/asm-powerpc/device.h
rename to arch/powerpc/include/asm/device.h
diff --git a/include/asm-powerpc/div64.h b/arch/powerpc/include/asm/div64.h
similarity index 100%
rename from include/asm-powerpc/div64.h
rename to arch/powerpc/include/asm/div64.h
diff --git a/include/asm-powerpc/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h
similarity index 100%
rename from include/asm-powerpc/dma-mapping.h
rename to arch/powerpc/include/asm/dma-mapping.h
diff --git a/include/asm-powerpc/dma.h b/arch/powerpc/include/asm/dma.h
similarity index 100%
rename from include/asm-powerpc/dma.h
rename to arch/powerpc/include/asm/dma.h
diff --git a/include/asm-powerpc/edac.h b/arch/powerpc/include/asm/edac.h
similarity index 100%
rename from include/asm-powerpc/edac.h
rename to arch/powerpc/include/asm/edac.h
diff --git a/include/asm-powerpc/eeh.h b/arch/powerpc/include/asm/eeh.h
similarity index 100%
rename from include/asm-powerpc/eeh.h
rename to arch/powerpc/include/asm/eeh.h
diff --git a/include/asm-powerpc/eeh_event.h b/arch/powerpc/include/asm/eeh_event.h
similarity index 100%
rename from include/asm-powerpc/eeh_event.h
rename to arch/powerpc/include/asm/eeh_event.h
diff --git a/include/asm-powerpc/elf.h b/arch/powerpc/include/asm/elf.h
similarity index 100%
rename from include/asm-powerpc/elf.h
rename to arch/powerpc/include/asm/elf.h
diff --git a/include/asm-powerpc/emergency-restart.h b/arch/powerpc/include/asm/emergency-restart.h
similarity index 100%
rename from include/asm-powerpc/emergency-restart.h
rename to arch/powerpc/include/asm/emergency-restart.h
diff --git a/include/asm-powerpc/errno.h b/arch/powerpc/include/asm/errno.h
similarity index 100%
rename from include/asm-powerpc/errno.h
rename to arch/powerpc/include/asm/errno.h
diff --git a/include/asm-powerpc/exception.h b/arch/powerpc/include/asm/exception.h
similarity index 100%
rename from include/asm-powerpc/exception.h
rename to arch/powerpc/include/asm/exception.h
diff --git a/include/asm-powerpc/fb.h b/arch/powerpc/include/asm/fb.h
similarity index 100%
rename from include/asm-powerpc/fb.h
rename to arch/powerpc/include/asm/fb.h
diff --git a/include/asm-powerpc/fcntl.h b/arch/powerpc/include/asm/fcntl.h
similarity index 100%
rename from include/asm-powerpc/fcntl.h
rename to arch/powerpc/include/asm/fcntl.h
diff --git a/include/asm-powerpc/feature-fixups.h b/arch/powerpc/include/asm/feature-fixups.h
similarity index 100%
rename from include/asm-powerpc/feature-fixups.h
rename to arch/powerpc/include/asm/feature-fixups.h
diff --git a/include/asm-powerpc/firmware.h b/arch/powerpc/include/asm/firmware.h
similarity index 100%
rename from include/asm-powerpc/firmware.h
rename to arch/powerpc/include/asm/firmware.h
diff --git a/include/asm-powerpc/fixmap.h b/arch/powerpc/include/asm/fixmap.h
similarity index 100%
rename from include/asm-powerpc/fixmap.h
rename to arch/powerpc/include/asm/fixmap.h
diff --git a/include/asm-powerpc/floppy.h b/arch/powerpc/include/asm/floppy.h
similarity index 100%
rename from include/asm-powerpc/floppy.h
rename to arch/powerpc/include/asm/floppy.h
diff --git a/include/asm-powerpc/fs_pd.h b/arch/powerpc/include/asm/fs_pd.h
similarity index 100%
rename from include/asm-powerpc/fs_pd.h
rename to arch/powerpc/include/asm/fs_pd.h
diff --git a/include/asm-powerpc/fsl_gtm.h b/arch/powerpc/include/asm/fsl_gtm.h
similarity index 100%
rename from include/asm-powerpc/fsl_gtm.h
rename to arch/powerpc/include/asm/fsl_gtm.h
diff --git a/include/asm-powerpc/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h
similarity index 100%
rename from include/asm-powerpc/fsl_lbc.h
rename to arch/powerpc/include/asm/fsl_lbc.h
diff --git a/include/asm-powerpc/ftrace.h b/arch/powerpc/include/asm/ftrace.h
similarity index 100%
rename from include/asm-powerpc/ftrace.h
rename to arch/powerpc/include/asm/ftrace.h
diff --git a/include/asm-powerpc/futex.h b/arch/powerpc/include/asm/futex.h
similarity index 100%
rename from include/asm-powerpc/futex.h
rename to arch/powerpc/include/asm/futex.h
diff --git a/include/asm-powerpc/gpio.h b/arch/powerpc/include/asm/gpio.h
similarity index 100%
rename from include/asm-powerpc/gpio.h
rename to arch/powerpc/include/asm/gpio.h
diff --git a/include/asm-powerpc/grackle.h b/arch/powerpc/include/asm/grackle.h
similarity index 100%
rename from include/asm-powerpc/grackle.h
rename to arch/powerpc/include/asm/grackle.h
diff --git a/include/asm-powerpc/hardirq.h b/arch/powerpc/include/asm/hardirq.h
similarity index 100%
rename from include/asm-powerpc/hardirq.h
rename to arch/powerpc/include/asm/hardirq.h
diff --git a/include/asm-powerpc/heathrow.h b/arch/powerpc/include/asm/heathrow.h
similarity index 100%
rename from include/asm-powerpc/heathrow.h
rename to arch/powerpc/include/asm/heathrow.h
diff --git a/include/asm-powerpc/highmem.h b/arch/powerpc/include/asm/highmem.h
similarity index 100%
rename from include/asm-powerpc/highmem.h
rename to arch/powerpc/include/asm/highmem.h
diff --git a/include/asm-powerpc/hugetlb.h b/arch/powerpc/include/asm/hugetlb.h
similarity index 100%
rename from include/asm-powerpc/hugetlb.h
rename to arch/powerpc/include/asm/hugetlb.h
diff --git a/include/asm-powerpc/hvcall.h b/arch/powerpc/include/asm/hvcall.h
similarity index 100%
rename from include/asm-powerpc/hvcall.h
rename to arch/powerpc/include/asm/hvcall.h
diff --git a/include/asm-powerpc/hvconsole.h b/arch/powerpc/include/asm/hvconsole.h
similarity index 100%
rename from include/asm-powerpc/hvconsole.h
rename to arch/powerpc/include/asm/hvconsole.h
diff --git a/include/asm-powerpc/hvcserver.h b/arch/powerpc/include/asm/hvcserver.h
similarity index 100%
rename from include/asm-powerpc/hvcserver.h
rename to arch/powerpc/include/asm/hvcserver.h
diff --git a/include/asm-powerpc/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h
similarity index 100%
rename from include/asm-powerpc/hw_irq.h
rename to arch/powerpc/include/asm/hw_irq.h
diff --git a/include/asm-powerpc/hydra.h b/arch/powerpc/include/asm/hydra.h
similarity index 100%
rename from include/asm-powerpc/hydra.h
rename to arch/powerpc/include/asm/hydra.h
diff --git a/include/asm-powerpc/i8259.h b/arch/powerpc/include/asm/i8259.h
similarity index 100%
rename from include/asm-powerpc/i8259.h
rename to arch/powerpc/include/asm/i8259.h
diff --git a/include/asm-powerpc/ibmebus.h b/arch/powerpc/include/asm/ibmebus.h
similarity index 100%
rename from include/asm-powerpc/ibmebus.h
rename to arch/powerpc/include/asm/ibmebus.h
diff --git a/include/asm-powerpc/ide.h b/arch/powerpc/include/asm/ide.h
similarity index 100%
rename from include/asm-powerpc/ide.h
rename to arch/powerpc/include/asm/ide.h
diff --git a/include/asm-powerpc/immap_86xx.h b/arch/powerpc/include/asm/immap_86xx.h
similarity index 100%
rename from include/asm-powerpc/immap_86xx.h
rename to arch/powerpc/include/asm/immap_86xx.h
diff --git a/include/asm-powerpc/immap_cpm2.h b/arch/powerpc/include/asm/immap_cpm2.h
similarity index 100%
rename from include/asm-powerpc/immap_cpm2.h
rename to arch/powerpc/include/asm/immap_cpm2.h
diff --git a/include/asm-powerpc/immap_qe.h b/arch/powerpc/include/asm/immap_qe.h
similarity index 99%
rename from include/asm-powerpc/immap_qe.h
rename to arch/powerpc/include/asm/immap_qe.h
index 7b6f411..3c2fced 100644
--- a/include/asm-powerpc/immap_qe.h
+++ b/arch/powerpc/include/asm/immap_qe.h
@@ -1,6 +1,4 @@
/*
- * include/asm-powerpc/immap_qe.h
- *
* QUICC Engine (QE) Internal Memory Map.
* The Internal Memory Map for devices with QE on them. This
* is the superset of all QE devices (8360, etc.).
diff --git a/include/asm-powerpc/io-defs.h b/arch/powerpc/include/asm/io-defs.h
similarity index 100%
rename from include/asm-powerpc/io-defs.h
rename to arch/powerpc/include/asm/io-defs.h
diff --git a/include/asm-powerpc/io.h b/arch/powerpc/include/asm/io.h
similarity index 100%
rename from include/asm-powerpc/io.h
rename to arch/powerpc/include/asm/io.h
diff --git a/include/asm-powerpc/ioctl.h b/arch/powerpc/include/asm/ioctl.h
similarity index 100%
rename from include/asm-powerpc/ioctl.h
rename to arch/powerpc/include/asm/ioctl.h
diff --git a/include/asm-powerpc/ioctls.h b/arch/powerpc/include/asm/ioctls.h
similarity index 100%
rename from include/asm-powerpc/ioctls.h
rename to arch/powerpc/include/asm/ioctls.h
diff --git a/include/asm-powerpc/iommu.h b/arch/powerpc/include/asm/iommu.h
similarity index 100%
rename from include/asm-powerpc/iommu.h
rename to arch/powerpc/include/asm/iommu.h
diff --git a/include/asm-powerpc/ipcbuf.h b/arch/powerpc/include/asm/ipcbuf.h
similarity index 100%
rename from include/asm-powerpc/ipcbuf.h
rename to arch/powerpc/include/asm/ipcbuf.h
diff --git a/include/asm-powerpc/ipic.h b/arch/powerpc/include/asm/ipic.h
similarity index 99%
rename from include/asm-powerpc/ipic.h
rename to arch/powerpc/include/asm/ipic.h
index 8ff08be..4cf3553 100644
--- a/include/asm-powerpc/ipic.h
+++ b/arch/powerpc/include/asm/ipic.h
@@ -1,6 +1,4 @@
/*
- * include/asm-powerpc/ipic.h
- *
* IPIC external definitions and structure.
*
* Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/include/asm-powerpc/irq.h b/arch/powerpc/include/asm/irq.h
similarity index 100%
rename from include/asm-powerpc/irq.h
rename to arch/powerpc/include/asm/irq.h
diff --git a/include/asm-powerpc/irq_regs.h b/arch/powerpc/include/asm/irq_regs.h
similarity index 100%
rename from include/asm-powerpc/irq_regs.h
rename to arch/powerpc/include/asm/irq_regs.h
diff --git a/include/asm-powerpc/irqflags.h b/arch/powerpc/include/asm/irqflags.h
similarity index 93%
rename from include/asm-powerpc/irqflags.h
rename to arch/powerpc/include/asm/irqflags.h
index cc6fdba..17ba3a8 100644
--- a/include/asm-powerpc/irqflags.h
+++ b/arch/powerpc/include/asm/irqflags.h
@@ -1,6 +1,4 @@
/*
- * include/asm-powerpc/irqflags.h
- *
* IRQ flags handling
*/
#ifndef _ASM_IRQFLAGS_H
@@ -10,7 +8,7 @@
/*
* Get definitions for raw_local_save_flags(x), etc.
*/
-#include <asm-powerpc/hw_irq.h>
+#include <asm/hw_irq.h>
#else
#ifdef CONFIG_TRACE_IRQFLAGS
diff --git a/include/asm-powerpc/iseries/alpaca.h b/arch/powerpc/include/asm/iseries/alpaca.h
similarity index 100%
rename from include/asm-powerpc/iseries/alpaca.h
rename to arch/powerpc/include/asm/iseries/alpaca.h
diff --git a/include/asm-powerpc/iseries/hv_call.h b/arch/powerpc/include/asm/iseries/hv_call.h
similarity index 100%
rename from include/asm-powerpc/iseries/hv_call.h
rename to arch/powerpc/include/asm/iseries/hv_call.h
diff --git a/include/asm-powerpc/iseries/hv_call_event.h b/arch/powerpc/include/asm/iseries/hv_call_event.h
similarity index 100%
rename from include/asm-powerpc/iseries/hv_call_event.h
rename to arch/powerpc/include/asm/iseries/hv_call_event.h
diff --git a/include/asm-powerpc/iseries/hv_call_sc.h b/arch/powerpc/include/asm/iseries/hv_call_sc.h
similarity index 100%
rename from include/asm-powerpc/iseries/hv_call_sc.h
rename to arch/powerpc/include/asm/iseries/hv_call_sc.h
diff --git a/include/asm-powerpc/iseries/hv_call_xm.h b/arch/powerpc/include/asm/iseries/hv_call_xm.h
similarity index 100%
rename from include/asm-powerpc/iseries/hv_call_xm.h
rename to arch/powerpc/include/asm/iseries/hv_call_xm.h
diff --git a/include/asm-powerpc/iseries/hv_lp_config.h b/arch/powerpc/include/asm/iseries/hv_lp_config.h
similarity index 100%
rename from include/asm-powerpc/iseries/hv_lp_config.h
rename to arch/powerpc/include/asm/iseries/hv_lp_config.h
diff --git a/include/asm-powerpc/iseries/hv_lp_event.h b/arch/powerpc/include/asm/iseries/hv_lp_event.h
similarity index 100%
rename from include/asm-powerpc/iseries/hv_lp_event.h
rename to arch/powerpc/include/asm/iseries/hv_lp_event.h
diff --git a/include/asm-powerpc/iseries/hv_types.h b/arch/powerpc/include/asm/iseries/hv_types.h
similarity index 100%
rename from include/asm-powerpc/iseries/hv_types.h
rename to arch/powerpc/include/asm/iseries/hv_types.h
diff --git a/include/asm-powerpc/iseries/iommu.h b/arch/powerpc/include/asm/iseries/iommu.h
similarity index 100%
rename from include/asm-powerpc/iseries/iommu.h
rename to arch/powerpc/include/asm/iseries/iommu.h
diff --git a/include/asm-powerpc/iseries/it_lp_queue.h b/arch/powerpc/include/asm/iseries/it_lp_queue.h
similarity index 100%
rename from include/asm-powerpc/iseries/it_lp_queue.h
rename to arch/powerpc/include/asm/iseries/it_lp_queue.h
diff --git a/include/asm-powerpc/iseries/lpar_map.h b/arch/powerpc/include/asm/iseries/lpar_map.h
similarity index 100%
rename from include/asm-powerpc/iseries/lpar_map.h
rename to arch/powerpc/include/asm/iseries/lpar_map.h
diff --git a/include/asm-powerpc/iseries/mf.h b/arch/powerpc/include/asm/iseries/mf.h
similarity index 100%
rename from include/asm-powerpc/iseries/mf.h
rename to arch/powerpc/include/asm/iseries/mf.h
diff --git a/include/asm-powerpc/iseries/vio.h b/arch/powerpc/include/asm/iseries/vio.h
similarity index 100%
rename from include/asm-powerpc/iseries/vio.h
rename to arch/powerpc/include/asm/iseries/vio.h
diff --git a/include/asm-powerpc/kdebug.h b/arch/powerpc/include/asm/kdebug.h
similarity index 100%
rename from include/asm-powerpc/kdebug.h
rename to arch/powerpc/include/asm/kdebug.h
diff --git a/include/asm-powerpc/kdump.h b/arch/powerpc/include/asm/kdump.h
similarity index 100%
rename from include/asm-powerpc/kdump.h
rename to arch/powerpc/include/asm/kdump.h
diff --git a/include/asm-powerpc/kexec.h b/arch/powerpc/include/asm/kexec.h
similarity index 100%
rename from include/asm-powerpc/kexec.h
rename to arch/powerpc/include/asm/kexec.h
diff --git a/include/asm-powerpc/keylargo.h b/arch/powerpc/include/asm/keylargo.h
similarity index 100%
rename from include/asm-powerpc/keylargo.h
rename to arch/powerpc/include/asm/keylargo.h
diff --git a/include/asm-powerpc/kgdb.h b/arch/powerpc/include/asm/kgdb.h
similarity index 98%
rename from include/asm-powerpc/kgdb.h
rename to arch/powerpc/include/asm/kgdb.h
index 1399caf..edd2170 100644
--- a/include/asm-powerpc/kgdb.h
+++ b/arch/powerpc/include/asm/kgdb.h
@@ -1,6 +1,4 @@
/*
- * include/asm-powerpc/kgdb.h
- *
* The PowerPC (32/64) specific defines / externs for KGDB. Based on
* the previous 32bit and 64bit specific files, which had the following
* copyrights:
diff --git a/include/asm-powerpc/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
similarity index 100%
rename from include/asm-powerpc/kmap_types.h
rename to arch/powerpc/include/asm/kmap_types.h
diff --git a/include/asm-powerpc/kprobes.h b/arch/powerpc/include/asm/kprobes.h
similarity index 100%
rename from include/asm-powerpc/kprobes.h
rename to arch/powerpc/include/asm/kprobes.h
diff --git a/include/asm-powerpc/kvm.h b/arch/powerpc/include/asm/kvm.h
similarity index 100%
rename from include/asm-powerpc/kvm.h
rename to arch/powerpc/include/asm/kvm.h
diff --git a/include/asm-powerpc/kvm_asm.h b/arch/powerpc/include/asm/kvm_asm.h
similarity index 100%
rename from include/asm-powerpc/kvm_asm.h
rename to arch/powerpc/include/asm/kvm_asm.h
diff --git a/include/asm-powerpc/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h
similarity index 100%
rename from include/asm-powerpc/kvm_host.h
rename to arch/powerpc/include/asm/kvm_host.h
diff --git a/include/asm-powerpc/kvm_para.h b/arch/powerpc/include/asm/kvm_para.h
similarity index 100%
rename from include/asm-powerpc/kvm_para.h
rename to arch/powerpc/include/asm/kvm_para.h
diff --git a/include/asm-powerpc/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h
similarity index 100%
rename from include/asm-powerpc/kvm_ppc.h
rename to arch/powerpc/include/asm/kvm_ppc.h
diff --git a/include/asm-powerpc/libata-portmap.h b/arch/powerpc/include/asm/libata-portmap.h
similarity index 100%
rename from include/asm-powerpc/libata-portmap.h
rename to arch/powerpc/include/asm/libata-portmap.h
diff --git a/include/asm-powerpc/linkage.h b/arch/powerpc/include/asm/linkage.h
similarity index 100%
rename from include/asm-powerpc/linkage.h
rename to arch/powerpc/include/asm/linkage.h
diff --git a/include/asm-powerpc/lmb.h b/arch/powerpc/include/asm/lmb.h
similarity index 100%
rename from include/asm-powerpc/lmb.h
rename to arch/powerpc/include/asm/lmb.h
diff --git a/include/asm-powerpc/local.h b/arch/powerpc/include/asm/local.h
similarity index 100%
rename from include/asm-powerpc/local.h
rename to arch/powerpc/include/asm/local.h
diff --git a/include/asm-powerpc/lppaca.h b/arch/powerpc/include/asm/lppaca.h
similarity index 100%
rename from include/asm-powerpc/lppaca.h
rename to arch/powerpc/include/asm/lppaca.h
diff --git a/include/asm-powerpc/lv1call.h b/arch/powerpc/include/asm/lv1call.h
similarity index 100%
rename from include/asm-powerpc/lv1call.h
rename to arch/powerpc/include/asm/lv1call.h
diff --git a/include/asm-powerpc/machdep.h b/arch/powerpc/include/asm/machdep.h
similarity index 100%
rename from include/asm-powerpc/machdep.h
rename to arch/powerpc/include/asm/machdep.h
diff --git a/include/asm-powerpc/macio.h b/arch/powerpc/include/asm/macio.h
similarity index 100%
rename from include/asm-powerpc/macio.h
rename to arch/powerpc/include/asm/macio.h
diff --git a/include/asm-powerpc/mc146818rtc.h b/arch/powerpc/include/asm/mc146818rtc.h
similarity index 100%
rename from include/asm-powerpc/mc146818rtc.h
rename to arch/powerpc/include/asm/mc146818rtc.h
diff --git a/include/asm-powerpc/mediabay.h b/arch/powerpc/include/asm/mediabay.h
similarity index 100%
rename from include/asm-powerpc/mediabay.h
rename to arch/powerpc/include/asm/mediabay.h
diff --git a/include/asm-powerpc/mman.h b/arch/powerpc/include/asm/mman.h
similarity index 100%
rename from include/asm-powerpc/mman.h
rename to arch/powerpc/include/asm/mman.h
diff --git a/include/asm-powerpc/mmu-40x.h b/arch/powerpc/include/asm/mmu-40x.h
similarity index 100%
rename from include/asm-powerpc/mmu-40x.h
rename to arch/powerpc/include/asm/mmu-40x.h
diff --git a/include/asm-powerpc/mmu-44x.h b/arch/powerpc/include/asm/mmu-44x.h
similarity index 100%
rename from include/asm-powerpc/mmu-44x.h
rename to arch/powerpc/include/asm/mmu-44x.h
diff --git a/include/asm-powerpc/mmu-8xx.h b/arch/powerpc/include/asm/mmu-8xx.h
similarity index 100%
rename from include/asm-powerpc/mmu-8xx.h
rename to arch/powerpc/include/asm/mmu-8xx.h
diff --git a/include/asm-powerpc/mmu-fsl-booke.h b/arch/powerpc/include/asm/mmu-fsl-booke.h
similarity index 100%
rename from include/asm-powerpc/mmu-fsl-booke.h
rename to arch/powerpc/include/asm/mmu-fsl-booke.h
diff --git a/include/asm-powerpc/mmu-hash32.h b/arch/powerpc/include/asm/mmu-hash32.h
similarity index 100%
rename from include/asm-powerpc/mmu-hash32.h
rename to arch/powerpc/include/asm/mmu-hash32.h
diff --git a/include/asm-powerpc/mmu-hash64.h b/arch/powerpc/include/asm/mmu-hash64.h
similarity index 100%
rename from include/asm-powerpc/mmu-hash64.h
rename to arch/powerpc/include/asm/mmu-hash64.h
diff --git a/include/asm-powerpc/mmu.h b/arch/powerpc/include/asm/mmu.h
similarity index 100%
rename from include/asm-powerpc/mmu.h
rename to arch/powerpc/include/asm/mmu.h
diff --git a/include/asm-powerpc/mmu_context.h b/arch/powerpc/include/asm/mmu_context.h
similarity index 100%
rename from include/asm-powerpc/mmu_context.h
rename to arch/powerpc/include/asm/mmu_context.h
diff --git a/include/asm-powerpc/mmzone.h b/arch/powerpc/include/asm/mmzone.h
similarity index 100%
rename from include/asm-powerpc/mmzone.h
rename to arch/powerpc/include/asm/mmzone.h
diff --git a/include/asm-powerpc/module.h b/arch/powerpc/include/asm/module.h
similarity index 100%
rename from include/asm-powerpc/module.h
rename to arch/powerpc/include/asm/module.h
diff --git a/include/asm-powerpc/mpc512x.h b/arch/powerpc/include/asm/mpc512x.h
similarity index 100%
rename from include/asm-powerpc/mpc512x.h
rename to arch/powerpc/include/asm/mpc512x.h
diff --git a/include/asm-powerpc/mpc52xx.h b/arch/powerpc/include/asm/mpc52xx.h
similarity index 100%
rename from include/asm-powerpc/mpc52xx.h
rename to arch/powerpc/include/asm/mpc52xx.h
diff --git a/include/asm-powerpc/mpc52xx_psc.h b/arch/powerpc/include/asm/mpc52xx_psc.h
similarity index 100%
rename from include/asm-powerpc/mpc52xx_psc.h
rename to arch/powerpc/include/asm/mpc52xx_psc.h
diff --git a/include/asm-powerpc/mpc6xx.h b/arch/powerpc/include/asm/mpc6xx.h
similarity index 100%
rename from include/asm-powerpc/mpc6xx.h
rename to arch/powerpc/include/asm/mpc6xx.h
diff --git a/include/asm-powerpc/mpc8260.h b/arch/powerpc/include/asm/mpc8260.h
similarity index 100%
rename from include/asm-powerpc/mpc8260.h
rename to arch/powerpc/include/asm/mpc8260.h
diff --git a/include/asm-powerpc/mpc86xx.h b/arch/powerpc/include/asm/mpc86xx.h
similarity index 100%
rename from include/asm-powerpc/mpc86xx.h
rename to arch/powerpc/include/asm/mpc86xx.h
diff --git a/include/asm-powerpc/mpc8xx.h b/arch/powerpc/include/asm/mpc8xx.h
similarity index 100%
rename from include/asm-powerpc/mpc8xx.h
rename to arch/powerpc/include/asm/mpc8xx.h
diff --git a/include/asm-powerpc/mpic.h b/arch/powerpc/include/asm/mpic.h
similarity index 100%
rename from include/asm-powerpc/mpic.h
rename to arch/powerpc/include/asm/mpic.h
diff --git a/include/asm-powerpc/msgbuf.h b/arch/powerpc/include/asm/msgbuf.h
similarity index 100%
rename from include/asm-powerpc/msgbuf.h
rename to arch/powerpc/include/asm/msgbuf.h
diff --git a/include/asm-powerpc/mutex.h b/arch/powerpc/include/asm/mutex.h
similarity index 100%
rename from include/asm-powerpc/mutex.h
rename to arch/powerpc/include/asm/mutex.h
diff --git a/include/asm-powerpc/nvram.h b/arch/powerpc/include/asm/nvram.h
similarity index 100%
rename from include/asm-powerpc/nvram.h
rename to arch/powerpc/include/asm/nvram.h
diff --git a/include/asm-powerpc/of.h b/arch/powerpc/include/asm/of.h
similarity index 100%
rename from include/asm-powerpc/of.h
rename to arch/powerpc/include/asm/of.h
diff --git a/include/asm-powerpc/of_device.h b/arch/powerpc/include/asm/of_device.h
similarity index 100%
rename from include/asm-powerpc/of_device.h
rename to arch/powerpc/include/asm/of_device.h
diff --git a/include/asm-powerpc/of_platform.h b/arch/powerpc/include/asm/of_platform.h
similarity index 100%
rename from include/asm-powerpc/of_platform.h
rename to arch/powerpc/include/asm/of_platform.h
diff --git a/include/asm-powerpc/ohare.h b/arch/powerpc/include/asm/ohare.h
similarity index 100%
rename from include/asm-powerpc/ohare.h
rename to arch/powerpc/include/asm/ohare.h
diff --git a/include/asm-powerpc/oprofile_impl.h b/arch/powerpc/include/asm/oprofile_impl.h
similarity index 100%
rename from include/asm-powerpc/oprofile_impl.h
rename to arch/powerpc/include/asm/oprofile_impl.h
diff --git a/include/asm-powerpc/pSeries_reconfig.h b/arch/powerpc/include/asm/pSeries_reconfig.h
similarity index 100%
rename from include/asm-powerpc/pSeries_reconfig.h
rename to arch/powerpc/include/asm/pSeries_reconfig.h
diff --git a/include/asm-powerpc/paca.h b/arch/powerpc/include/asm/paca.h
similarity index 99%
rename from include/asm-powerpc/paca.h
rename to arch/powerpc/include/asm/paca.h
index 7b56444..6493a39 100644
--- a/include/asm-powerpc/paca.h
+++ b/arch/powerpc/include/asm/paca.h
@@ -1,6 +1,4 @@
/*
- * include/asm-powerpc/paca.h
- *
* This control block defines the PACA which defines the processor
* specific data for each logical processor on the system.
* There are some pointers defined that are utilized by PLIC.
diff --git a/include/asm-powerpc/page.h b/arch/powerpc/include/asm/page.h
similarity index 100%
rename from include/asm-powerpc/page.h
rename to arch/powerpc/include/asm/page.h
diff --git a/include/asm-powerpc/page_32.h b/arch/powerpc/include/asm/page_32.h
similarity index 100%
rename from include/asm-powerpc/page_32.h
rename to arch/powerpc/include/asm/page_32.h
diff --git a/include/asm-powerpc/page_64.h b/arch/powerpc/include/asm/page_64.h
similarity index 100%
rename from include/asm-powerpc/page_64.h
rename to arch/powerpc/include/asm/page_64.h
diff --git a/include/asm-powerpc/param.h b/arch/powerpc/include/asm/param.h
similarity index 100%
rename from include/asm-powerpc/param.h
rename to arch/powerpc/include/asm/param.h
diff --git a/include/asm-powerpc/parport.h b/arch/powerpc/include/asm/parport.h
similarity index 100%
rename from include/asm-powerpc/parport.h
rename to arch/powerpc/include/asm/parport.h
diff --git a/include/asm-powerpc/pasemi_dma.h b/arch/powerpc/include/asm/pasemi_dma.h
similarity index 100%
rename from include/asm-powerpc/pasemi_dma.h
rename to arch/powerpc/include/asm/pasemi_dma.h
diff --git a/include/asm-powerpc/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h
similarity index 100%
rename from include/asm-powerpc/pci-bridge.h
rename to arch/powerpc/include/asm/pci-bridge.h
diff --git a/include/asm-powerpc/pci.h b/arch/powerpc/include/asm/pci.h
similarity index 100%
rename from include/asm-powerpc/pci.h
rename to arch/powerpc/include/asm/pci.h
diff --git a/include/asm-powerpc/percpu.h b/arch/powerpc/include/asm/percpu.h
similarity index 100%
rename from include/asm-powerpc/percpu.h
rename to arch/powerpc/include/asm/percpu.h
diff --git a/include/asm-powerpc/pgalloc-32.h b/arch/powerpc/include/asm/pgalloc-32.h
similarity index 100%
rename from include/asm-powerpc/pgalloc-32.h
rename to arch/powerpc/include/asm/pgalloc-32.h
diff --git a/include/asm-powerpc/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
similarity index 100%
rename from include/asm-powerpc/pgalloc-64.h
rename to arch/powerpc/include/asm/pgalloc-64.h
diff --git a/include/asm-powerpc/pgalloc.h b/arch/powerpc/include/asm/pgalloc.h
similarity index 100%
rename from include/asm-powerpc/pgalloc.h
rename to arch/powerpc/include/asm/pgalloc.h
diff --git a/include/asm-powerpc/pgtable-4k.h b/arch/powerpc/include/asm/pgtable-4k.h
similarity index 100%
rename from include/asm-powerpc/pgtable-4k.h
rename to arch/powerpc/include/asm/pgtable-4k.h
diff --git a/include/asm-powerpc/pgtable-64k.h b/arch/powerpc/include/asm/pgtable-64k.h
similarity index 100%
rename from include/asm-powerpc/pgtable-64k.h
rename to arch/powerpc/include/asm/pgtable-64k.h
diff --git a/include/asm-powerpc/pgtable-ppc32.h b/arch/powerpc/include/asm/pgtable-ppc32.h
similarity index 100%
rename from include/asm-powerpc/pgtable-ppc32.h
rename to arch/powerpc/include/asm/pgtable-ppc32.h
diff --git a/include/asm-powerpc/pgtable-ppc64.h b/arch/powerpc/include/asm/pgtable-ppc64.h
similarity index 99%
rename from include/asm-powerpc/pgtable-ppc64.h
rename to arch/powerpc/include/asm/pgtable-ppc64.h
index 5fc78c0..afdfab9 100644
--- a/include/asm-powerpc/pgtable-ppc64.h
+++ b/arch/powerpc/include/asm/pgtable-ppc64.h
@@ -100,7 +100,7 @@
#define _PAGE_WRENABLE (_PAGE_RW | _PAGE_DIRTY)
-/* __pgprot defined in asm-powerpc/page.h */
+/* __pgprot defined in arch/powerpc/incliude/asm/page.h */
#define PAGE_NONE __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED)
#define PAGE_SHARED __pgprot(_PAGE_BASE | _PAGE_RW | _PAGE_USER)
diff --git a/include/asm-powerpc/pgtable.h b/arch/powerpc/include/asm/pgtable.h
similarity index 100%
rename from include/asm-powerpc/pgtable.h
rename to arch/powerpc/include/asm/pgtable.h
diff --git a/include/asm-powerpc/phyp_dump.h b/arch/powerpc/include/asm/phyp_dump.h
similarity index 100%
rename from include/asm-powerpc/phyp_dump.h
rename to arch/powerpc/include/asm/phyp_dump.h
diff --git a/include/asm-powerpc/pmac_feature.h b/arch/powerpc/include/asm/pmac_feature.h
similarity index 100%
rename from include/asm-powerpc/pmac_feature.h
rename to arch/powerpc/include/asm/pmac_feature.h
diff --git a/include/asm-powerpc/pmac_low_i2c.h b/arch/powerpc/include/asm/pmac_low_i2c.h
similarity index 100%
rename from include/asm-powerpc/pmac_low_i2c.h
rename to arch/powerpc/include/asm/pmac_low_i2c.h
diff --git a/include/asm-powerpc/pmac_pfunc.h b/arch/powerpc/include/asm/pmac_pfunc.h
similarity index 100%
rename from include/asm-powerpc/pmac_pfunc.h
rename to arch/powerpc/include/asm/pmac_pfunc.h
diff --git a/include/asm-powerpc/pmc.h b/arch/powerpc/include/asm/pmc.h
similarity index 100%
rename from include/asm-powerpc/pmc.h
rename to arch/powerpc/include/asm/pmc.h
diff --git a/include/asm-powerpc/pmi.h b/arch/powerpc/include/asm/pmi.h
similarity index 100%
rename from include/asm-powerpc/pmi.h
rename to arch/powerpc/include/asm/pmi.h
diff --git a/include/asm-powerpc/poll.h b/arch/powerpc/include/asm/poll.h
similarity index 100%
rename from include/asm-powerpc/poll.h
rename to arch/powerpc/include/asm/poll.h
diff --git a/include/asm-powerpc/posix_types.h b/arch/powerpc/include/asm/posix_types.h
similarity index 100%
rename from include/asm-powerpc/posix_types.h
rename to arch/powerpc/include/asm/posix_types.h
diff --git a/include/asm-powerpc/ppc-pci.h b/arch/powerpc/include/asm/ppc-pci.h
similarity index 100%
rename from include/asm-powerpc/ppc-pci.h
rename to arch/powerpc/include/asm/ppc-pci.h
diff --git a/include/asm-powerpc/ppc4xx.h b/arch/powerpc/include/asm/ppc4xx.h
similarity index 100%
rename from include/asm-powerpc/ppc4xx.h
rename to arch/powerpc/include/asm/ppc4xx.h
diff --git a/include/asm-powerpc/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h
similarity index 100%
rename from include/asm-powerpc/ppc_asm.h
rename to arch/powerpc/include/asm/ppc_asm.h
diff --git a/include/asm-powerpc/processor.h b/arch/powerpc/include/asm/processor.h
similarity index 100%
rename from include/asm-powerpc/processor.h
rename to arch/powerpc/include/asm/processor.h
diff --git a/include/asm-powerpc/prom.h b/arch/powerpc/include/asm/prom.h
similarity index 100%
rename from include/asm-powerpc/prom.h
rename to arch/powerpc/include/asm/prom.h
diff --git a/include/asm-powerpc/ps3.h b/arch/powerpc/include/asm/ps3.h
similarity index 100%
rename from include/asm-powerpc/ps3.h
rename to arch/powerpc/include/asm/ps3.h
diff --git a/include/asm-powerpc/ps3av.h b/arch/powerpc/include/asm/ps3av.h
similarity index 100%
rename from include/asm-powerpc/ps3av.h
rename to arch/powerpc/include/asm/ps3av.h
diff --git a/include/asm-powerpc/ps3fb.h b/arch/powerpc/include/asm/ps3fb.h
similarity index 100%
rename from include/asm-powerpc/ps3fb.h
rename to arch/powerpc/include/asm/ps3fb.h
diff --git a/include/asm-powerpc/ps3stor.h b/arch/powerpc/include/asm/ps3stor.h
similarity index 100%
rename from include/asm-powerpc/ps3stor.h
rename to arch/powerpc/include/asm/ps3stor.h
diff --git a/include/asm-powerpc/ptrace.h b/arch/powerpc/include/asm/ptrace.h
similarity index 100%
rename from include/asm-powerpc/ptrace.h
rename to arch/powerpc/include/asm/ptrace.h
diff --git a/include/asm-powerpc/qe.h b/arch/powerpc/include/asm/qe.h
similarity index 100%
rename from include/asm-powerpc/qe.h
rename to arch/powerpc/include/asm/qe.h
diff --git a/include/asm-powerpc/qe_ic.h b/arch/powerpc/include/asm/qe_ic.h
similarity index 99%
rename from include/asm-powerpc/qe_ic.h
rename to arch/powerpc/include/asm/qe_ic.h
index a779b2c..56a7745 100644
--- a/include/asm-powerpc/qe_ic.h
+++ b/arch/powerpc/include/asm/qe_ic.h
@@ -1,6 +1,4 @@
/*
- * include/asm-powerpc/qe_ic.h
- *
* Copyright (C) 2006 Freescale Semicondutor, Inc. All rights reserved.
*
* Authors: Shlomi Gridish <gridish@freescale.com>
diff --git a/include/asm-powerpc/reg.h b/arch/powerpc/include/asm/reg.h
similarity index 100%
rename from include/asm-powerpc/reg.h
rename to arch/powerpc/include/asm/reg.h
diff --git a/include/asm-powerpc/reg_8xx.h b/arch/powerpc/include/asm/reg_8xx.h
similarity index 100%
rename from include/asm-powerpc/reg_8xx.h
rename to arch/powerpc/include/asm/reg_8xx.h
diff --git a/include/asm-powerpc/reg_booke.h b/arch/powerpc/include/asm/reg_booke.h
similarity index 100%
rename from include/asm-powerpc/reg_booke.h
rename to arch/powerpc/include/asm/reg_booke.h
diff --git a/include/asm-powerpc/reg_fsl_emb.h b/arch/powerpc/include/asm/reg_fsl_emb.h
similarity index 100%
rename from include/asm-powerpc/reg_fsl_emb.h
rename to arch/powerpc/include/asm/reg_fsl_emb.h
diff --git a/include/asm-powerpc/resource.h b/arch/powerpc/include/asm/resource.h
similarity index 100%
rename from include/asm-powerpc/resource.h
rename to arch/powerpc/include/asm/resource.h
diff --git a/include/asm-powerpc/rheap.h b/arch/powerpc/include/asm/rheap.h
similarity index 100%
rename from include/asm-powerpc/rheap.h
rename to arch/powerpc/include/asm/rheap.h
diff --git a/include/asm-powerpc/rio.h b/arch/powerpc/include/asm/rio.h
similarity index 100%
rename from include/asm-powerpc/rio.h
rename to arch/powerpc/include/asm/rio.h
diff --git a/include/asm-powerpc/rtas.h b/arch/powerpc/include/asm/rtas.h
similarity index 100%
rename from include/asm-powerpc/rtas.h
rename to arch/powerpc/include/asm/rtas.h
diff --git a/include/asm-powerpc/rtc.h b/arch/powerpc/include/asm/rtc.h
similarity index 100%
rename from include/asm-powerpc/rtc.h
rename to arch/powerpc/include/asm/rtc.h
diff --git a/include/asm-powerpc/rwsem.h b/arch/powerpc/include/asm/rwsem.h
similarity index 96%
rename from include/asm-powerpc/rwsem.h
rename to arch/powerpc/include/asm/rwsem.h
index a6cc93b..24cd928 100644
--- a/include/asm-powerpc/rwsem.h
+++ b/arch/powerpc/include/asm/rwsem.h
@@ -8,8 +8,8 @@
#ifdef __KERNEL__
/*
- * include/asm-powerpc/rwsem.h: R/W semaphores for PPC using the stuff
- * in lib/rwsem.c. Adapted largely from include/asm-i386/rwsem.h
+ * R/W semaphores for PPC using the stuff in lib/rwsem.c.
+ * Adapted largely from include/asm-i386/rwsem.h
* by Paul Mackerras <paulus@samba.org>.
*/
diff --git a/include/asm-powerpc/scatterlist.h b/arch/powerpc/include/asm/scatterlist.h
similarity index 100%
rename from include/asm-powerpc/scatterlist.h
rename to arch/powerpc/include/asm/scatterlist.h
diff --git a/include/asm-powerpc/seccomp.h b/arch/powerpc/include/asm/seccomp.h
similarity index 100%
rename from include/asm-powerpc/seccomp.h
rename to arch/powerpc/include/asm/seccomp.h
diff --git a/include/asm-powerpc/sections.h b/arch/powerpc/include/asm/sections.h
similarity index 100%
rename from include/asm-powerpc/sections.h
rename to arch/powerpc/include/asm/sections.h
diff --git a/include/asm-powerpc/sembuf.h b/arch/powerpc/include/asm/sembuf.h
similarity index 100%
rename from include/asm-powerpc/sembuf.h
rename to arch/powerpc/include/asm/sembuf.h
diff --git a/include/asm-powerpc/serial.h b/arch/powerpc/include/asm/serial.h
similarity index 100%
rename from include/asm-powerpc/serial.h
rename to arch/powerpc/include/asm/serial.h
diff --git a/include/asm-powerpc/setjmp.h b/arch/powerpc/include/asm/setjmp.h
similarity index 100%
rename from include/asm-powerpc/setjmp.h
rename to arch/powerpc/include/asm/setjmp.h
diff --git a/include/asm-powerpc/setup.h b/arch/powerpc/include/asm/setup.h
similarity index 100%
rename from include/asm-powerpc/setup.h
rename to arch/powerpc/include/asm/setup.h
diff --git a/include/asm-powerpc/shmbuf.h b/arch/powerpc/include/asm/shmbuf.h
similarity index 100%
rename from include/asm-powerpc/shmbuf.h
rename to arch/powerpc/include/asm/shmbuf.h
diff --git a/include/asm-powerpc/shmparam.h b/arch/powerpc/include/asm/shmparam.h
similarity index 100%
rename from include/asm-powerpc/shmparam.h
rename to arch/powerpc/include/asm/shmparam.h
diff --git a/include/asm-powerpc/sigcontext.h b/arch/powerpc/include/asm/sigcontext.h
similarity index 100%
rename from include/asm-powerpc/sigcontext.h
rename to arch/powerpc/include/asm/sigcontext.h
diff --git a/include/asm-powerpc/siginfo.h b/arch/powerpc/include/asm/siginfo.h
similarity index 100%
rename from include/asm-powerpc/siginfo.h
rename to arch/powerpc/include/asm/siginfo.h
diff --git a/include/asm-powerpc/signal.h b/arch/powerpc/include/asm/signal.h
similarity index 100%
rename from include/asm-powerpc/signal.h
rename to arch/powerpc/include/asm/signal.h
diff --git a/include/asm-powerpc/smp.h b/arch/powerpc/include/asm/smp.h
similarity index 100%
rename from include/asm-powerpc/smp.h
rename to arch/powerpc/include/asm/smp.h
diff --git a/include/asm-powerpc/smu.h b/arch/powerpc/include/asm/smu.h
similarity index 100%
rename from include/asm-powerpc/smu.h
rename to arch/powerpc/include/asm/smu.h
diff --git a/include/asm-powerpc/socket.h b/arch/powerpc/include/asm/socket.h
similarity index 100%
rename from include/asm-powerpc/socket.h
rename to arch/powerpc/include/asm/socket.h
diff --git a/include/asm-powerpc/sockios.h b/arch/powerpc/include/asm/sockios.h
similarity index 100%
rename from include/asm-powerpc/sockios.h
rename to arch/powerpc/include/asm/sockios.h
diff --git a/include/asm-powerpc/sparsemem.h b/arch/powerpc/include/asm/sparsemem.h
similarity index 100%
rename from include/asm-powerpc/sparsemem.h
rename to arch/powerpc/include/asm/sparsemem.h
diff --git a/include/asm-powerpc/spinlock.h b/arch/powerpc/include/asm/spinlock.h
similarity index 100%
rename from include/asm-powerpc/spinlock.h
rename to arch/powerpc/include/asm/spinlock.h
diff --git a/include/asm-powerpc/spinlock_types.h b/arch/powerpc/include/asm/spinlock_types.h
similarity index 100%
rename from include/asm-powerpc/spinlock_types.h
rename to arch/powerpc/include/asm/spinlock_types.h
diff --git a/include/asm-powerpc/spu.h b/arch/powerpc/include/asm/spu.h
similarity index 100%
rename from include/asm-powerpc/spu.h
rename to arch/powerpc/include/asm/spu.h
diff --git a/include/asm-powerpc/spu_csa.h b/arch/powerpc/include/asm/spu_csa.h
similarity index 100%
rename from include/asm-powerpc/spu_csa.h
rename to arch/powerpc/include/asm/spu_csa.h
diff --git a/include/asm-powerpc/spu_info.h b/arch/powerpc/include/asm/spu_info.h
similarity index 100%
rename from include/asm-powerpc/spu_info.h
rename to arch/powerpc/include/asm/spu_info.h
diff --git a/include/asm-powerpc/spu_priv1.h b/arch/powerpc/include/asm/spu_priv1.h
similarity index 100%
rename from include/asm-powerpc/spu_priv1.h
rename to arch/powerpc/include/asm/spu_priv1.h
diff --git a/include/asm-powerpc/sstep.h b/arch/powerpc/include/asm/sstep.h
similarity index 100%
rename from include/asm-powerpc/sstep.h
rename to arch/powerpc/include/asm/sstep.h
diff --git a/include/asm-powerpc/stat.h b/arch/powerpc/include/asm/stat.h
similarity index 100%
rename from include/asm-powerpc/stat.h
rename to arch/powerpc/include/asm/stat.h
diff --git a/include/asm-powerpc/statfs.h b/arch/powerpc/include/asm/statfs.h
similarity index 100%
rename from include/asm-powerpc/statfs.h
rename to arch/powerpc/include/asm/statfs.h
diff --git a/include/asm-powerpc/string.h b/arch/powerpc/include/asm/string.h
similarity index 100%
rename from include/asm-powerpc/string.h
rename to arch/powerpc/include/asm/string.h
diff --git a/include/asm-powerpc/suspend.h b/arch/powerpc/include/asm/suspend.h
similarity index 100%
rename from include/asm-powerpc/suspend.h
rename to arch/powerpc/include/asm/suspend.h
diff --git a/include/asm-powerpc/synch.h b/arch/powerpc/include/asm/synch.h
similarity index 100%
rename from include/asm-powerpc/synch.h
rename to arch/powerpc/include/asm/synch.h
diff --git a/include/asm-powerpc/syscall.h b/arch/powerpc/include/asm/syscall.h
similarity index 100%
rename from include/asm-powerpc/syscall.h
rename to arch/powerpc/include/asm/syscall.h
diff --git a/include/asm-powerpc/syscalls.h b/arch/powerpc/include/asm/syscalls.h
similarity index 100%
rename from include/asm-powerpc/syscalls.h
rename to arch/powerpc/include/asm/syscalls.h
diff --git a/include/asm-powerpc/systbl.h b/arch/powerpc/include/asm/systbl.h
similarity index 100%
rename from include/asm-powerpc/systbl.h
rename to arch/powerpc/include/asm/systbl.h
diff --git a/include/asm-powerpc/system.h b/arch/powerpc/include/asm/system.h
similarity index 100%
rename from include/asm-powerpc/system.h
rename to arch/powerpc/include/asm/system.h
diff --git a/include/asm-powerpc/tce.h b/arch/powerpc/include/asm/tce.h
similarity index 100%
rename from include/asm-powerpc/tce.h
rename to arch/powerpc/include/asm/tce.h
diff --git a/include/asm-powerpc/termbits.h b/arch/powerpc/include/asm/termbits.h
similarity index 100%
rename from include/asm-powerpc/termbits.h
rename to arch/powerpc/include/asm/termbits.h
diff --git a/include/asm-powerpc/termios.h b/arch/powerpc/include/asm/termios.h
similarity index 100%
rename from include/asm-powerpc/termios.h
rename to arch/powerpc/include/asm/termios.h
diff --git a/include/asm-powerpc/thread_info.h b/arch/powerpc/include/asm/thread_info.h
similarity index 100%
rename from include/asm-powerpc/thread_info.h
rename to arch/powerpc/include/asm/thread_info.h
diff --git a/include/asm-powerpc/time.h b/arch/powerpc/include/asm/time.h
similarity index 100%
rename from include/asm-powerpc/time.h
rename to arch/powerpc/include/asm/time.h
diff --git a/include/asm-powerpc/timex.h b/arch/powerpc/include/asm/timex.h
similarity index 100%
rename from include/asm-powerpc/timex.h
rename to arch/powerpc/include/asm/timex.h
diff --git a/include/asm-powerpc/tlb.h b/arch/powerpc/include/asm/tlb.h
similarity index 100%
rename from include/asm-powerpc/tlb.h
rename to arch/powerpc/include/asm/tlb.h
diff --git a/include/asm-powerpc/tlbflush.h b/arch/powerpc/include/asm/tlbflush.h
similarity index 100%
rename from include/asm-powerpc/tlbflush.h
rename to arch/powerpc/include/asm/tlbflush.h
diff --git a/include/asm-powerpc/topology.h b/arch/powerpc/include/asm/topology.h
similarity index 100%
rename from include/asm-powerpc/topology.h
rename to arch/powerpc/include/asm/topology.h
diff --git a/include/asm-powerpc/tsi108.h b/arch/powerpc/include/asm/tsi108.h
similarity index 100%
rename from include/asm-powerpc/tsi108.h
rename to arch/powerpc/include/asm/tsi108.h
diff --git a/include/asm-powerpc/tsi108_irq.h b/arch/powerpc/include/asm/tsi108_irq.h
similarity index 100%
rename from include/asm-powerpc/tsi108_irq.h
rename to arch/powerpc/include/asm/tsi108_irq.h
diff --git a/include/asm-powerpc/tsi108_pci.h b/arch/powerpc/include/asm/tsi108_pci.h
similarity index 100%
rename from include/asm-powerpc/tsi108_pci.h
rename to arch/powerpc/include/asm/tsi108_pci.h
diff --git a/include/asm-powerpc/types.h b/arch/powerpc/include/asm/types.h
similarity index 100%
rename from include/asm-powerpc/types.h
rename to arch/powerpc/include/asm/types.h
diff --git a/include/asm-powerpc/uaccess.h b/arch/powerpc/include/asm/uaccess.h
similarity index 100%
rename from include/asm-powerpc/uaccess.h
rename to arch/powerpc/include/asm/uaccess.h
diff --git a/include/asm-powerpc/ucc.h b/arch/powerpc/include/asm/ucc.h
similarity index 100%
rename from include/asm-powerpc/ucc.h
rename to arch/powerpc/include/asm/ucc.h
diff --git a/include/asm-powerpc/ucc_fast.h b/arch/powerpc/include/asm/ucc_fast.h
similarity index 99%
rename from include/asm-powerpc/ucc_fast.h
rename to arch/powerpc/include/asm/ucc_fast.h
index fce16ab..839aab8 100644
--- a/include/asm-powerpc/ucc_fast.h
+++ b/arch/powerpc/include/asm/ucc_fast.h
@@ -1,6 +1,4 @@
/*
- * include/asm-powerpc/ucc_fast.h
- *
* Internal header file for UCC FAST unit routines.
*
* Copyright (C) 2006 Freescale Semicondutor, Inc. All rights reserved.
diff --git a/include/asm-powerpc/ucc_slow.h b/arch/powerpc/include/asm/ucc_slow.h
similarity index 100%
rename from include/asm-powerpc/ucc_slow.h
rename to arch/powerpc/include/asm/ucc_slow.h
diff --git a/include/asm-powerpc/ucontext.h b/arch/powerpc/include/asm/ucontext.h
similarity index 100%
rename from include/asm-powerpc/ucontext.h
rename to arch/powerpc/include/asm/ucontext.h
diff --git a/include/asm-powerpc/udbg.h b/arch/powerpc/include/asm/udbg.h
similarity index 100%
rename from include/asm-powerpc/udbg.h
rename to arch/powerpc/include/asm/udbg.h
diff --git a/include/asm-powerpc/uic.h b/arch/powerpc/include/asm/uic.h
similarity index 95%
rename from include/asm-powerpc/uic.h
rename to arch/powerpc/include/asm/uic.h
index 970eb7e..597edfc 100644
--- a/include/asm-powerpc/uic.h
+++ b/arch/powerpc/include/asm/uic.h
@@ -1,6 +1,4 @@
/*
- * include/asm-powerpc/uic.h
- *
* IBM PPC4xx UIC external definitions and structure.
*
* Maintainer: David Gibson <dwg@au1.ibm.com>
diff --git a/include/asm-powerpc/unaligned.h b/arch/powerpc/include/asm/unaligned.h
similarity index 100%
rename from include/asm-powerpc/unaligned.h
rename to arch/powerpc/include/asm/unaligned.h
diff --git a/include/asm-powerpc/uninorth.h b/arch/powerpc/include/asm/uninorth.h
similarity index 100%
rename from include/asm-powerpc/uninorth.h
rename to arch/powerpc/include/asm/uninorth.h
diff --git a/include/asm-powerpc/unistd.h b/arch/powerpc/include/asm/unistd.h
similarity index 100%
rename from include/asm-powerpc/unistd.h
rename to arch/powerpc/include/asm/unistd.h
diff --git a/include/asm-powerpc/user.h b/arch/powerpc/include/asm/user.h
similarity index 100%
rename from include/asm-powerpc/user.h
rename to arch/powerpc/include/asm/user.h
diff --git a/include/asm-powerpc/vdso.h b/arch/powerpc/include/asm/vdso.h
similarity index 100%
rename from include/asm-powerpc/vdso.h
rename to arch/powerpc/include/asm/vdso.h
diff --git a/include/asm-powerpc/vdso_datapage.h b/arch/powerpc/include/asm/vdso_datapage.h
similarity index 100%
rename from include/asm-powerpc/vdso_datapage.h
rename to arch/powerpc/include/asm/vdso_datapage.h
diff --git a/include/asm-powerpc/vga.h b/arch/powerpc/include/asm/vga.h
similarity index 100%
rename from include/asm-powerpc/vga.h
rename to arch/powerpc/include/asm/vga.h
diff --git a/include/asm-powerpc/vio.h b/arch/powerpc/include/asm/vio.h
similarity index 100%
rename from include/asm-powerpc/vio.h
rename to arch/powerpc/include/asm/vio.h
diff --git a/include/asm-powerpc/xilinx_intc.h b/arch/powerpc/include/asm/xilinx_intc.h
similarity index 100%
rename from include/asm-powerpc/xilinx_intc.h
rename to arch/powerpc/include/asm/xilinx_intc.h
diff --git a/include/asm-powerpc/xmon.h b/arch/powerpc/include/asm/xmon.h
similarity index 100%
rename from include/asm-powerpc/xmon.h
rename to arch/powerpc/include/asm/xmon.h
diff --git a/include/asm-powerpc/xor.h b/arch/powerpc/include/asm/xor.h
similarity index 100%
rename from include/asm-powerpc/xor.h
rename to arch/powerpc/include/asm/xor.h
diff --git a/arch/powerpc/mm/tlb_64.c b/arch/powerpc/mm/tlb_64.c
index 409fcc7..be7dd42 100644
--- a/arch/powerpc/mm/tlb_64.c
+++ b/arch/powerpc/mm/tlb_64.c
@@ -34,7 +34,7 @@
DEFINE_PER_CPU(struct ppc64_tlb_batch, ppc64_tlb_batch);
/* This is declared as we are using the more or less generic
- * include/asm-powerpc/tlb.h file -- tgall
+ * arch/powerpc/include/asm/tlb.h file -- tgall
*/
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
static DEFINE_PER_CPU(struct pte_freelist_batch *, pte_freelist_cur);
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_smp.c b/arch/powerpc/platforms/86xx/mpc86xx_smp.c
index 835f2dc..014e26c 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_smp.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_smp.c
@@ -19,7 +19,7 @@
#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/pci-bridge.h>
-#include <asm-powerpc/mpic.h>
+#include <asm/mpic.h>
#include <asm/mpc86xx.h>
#include <asm/cacheflush.h>
diff --git a/drivers/char/hvc_console.h b/drivers/char/hvc_console.h
index d9ce109..9790201 100644
--- a/drivers/char/hvc_console.h
+++ b/drivers/char/hvc_console.h
@@ -6,7 +6,7 @@
* Ryan S. Arnold <rsa@us.ibm.com>
*
* hvc_console header information:
- * moved here from include/asm-powerpc/hvconsole.h
+ * moved here from arch/powerpc/include/asm/hvconsole.h
* and drivers/char/hvc_console.c
*
* This program is free software; you can redistribute it and/or modify
diff --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c
index 786d518..29911ed 100644
--- a/drivers/char/hvcs.c
+++ b/drivers/char/hvcs.c
@@ -114,7 +114,7 @@
* the hvcs_final_close() function in order to get it out of the spinlock.
* Rearranged hvcs_close(). Cleaned up some printks and did some housekeeping
* on the changelog. Removed local CLC_LENGTH and used HVCS_CLC_LENGTH from
- * include/asm-powerpc/hvcserver.h
+ * arch/powerepc/include/asm/hvcserver.h
*
* 1.3.2 -> 1.3.3 Replaced yield() in hvcs_close() with tty_wait_until_sent() to
* prevent possible lockup with realtime scheduling as similarily pointed out by
diff --git a/drivers/infiniband/hw/ehca/ehca_reqs.c b/drivers/infiniband/hw/ehca/ehca_reqs.c
index dd9bc68..898c8b5 100644
--- a/drivers/infiniband/hw/ehca/ehca_reqs.c
+++ b/drivers/infiniband/hw/ehca/ehca_reqs.c
@@ -42,7 +42,7 @@
*/
-#include <asm-powerpc/system.h>
+#include <asm/system.h>
#include "ehca_classes.h"
#include "ehca_tools.h"
#include "ehca_qes.h"
diff --git a/include/asm-ia64/cputime.h b/include/asm-ia64/cputime.h
index f9abdec..27d4d5b 100644
--- a/include/asm-ia64/cputime.h
+++ b/include/asm-ia64/cputime.h
@@ -2,7 +2,7 @@
* include/asm-ia64/cputime.h:
* Definitions for measuring cputime on ia64 machines.
*
- * Based on <asm-powerpc/cputime.h>.
+ * Based on <arch/powerpc/include/asm/cputime.h>.
*
* Copyright (C) 2007 FUJITSU LIMITED
* Copyright (C) 2007 Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
diff --git a/include/asm-x86/calgary.h b/include/asm-x86/calgary.h
index 67f6040..71e61f5 100644
--- a/include/asm-x86/calgary.h
+++ b/include/asm-x86/calgary.h
@@ -1,5 +1,5 @@
/*
- * Derived from include/asm-powerpc/iommu.h
+ * Derived from arch/powerpc/include/asm/iommu.h
*
* Copyright IBM Corporation, 2006-2007
*
diff --git a/include/asm-x86/tce.h b/include/asm-x86/tce.h
index b1a4ea0..9620020 100644
--- a/include/asm-x86/tce.h
+++ b/include/asm-x86/tce.h
@@ -1,5 +1,5 @@
/*
- * This file is derived from asm-powerpc/tce.h.
+ * This file is derived from arch/powerpc/include/asm/tce.h.
*
* Copyright (C) IBM Corporation, 2006
*
--
1.5.6.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* Re: ide pmac breakage
From: Benjamin Herrenschmidt @ 2008-07-29 5:20 UTC (permalink / raw)
To: FUJITA Tomonori; +Cc: linux-ide, petkovbb, bzolnier, linuxppc-dev
In-Reply-To: <20080729141750V.fujita.tomonori@lab.ntt.co.jp>
On Tue, 2008-07-29 at 14:17 +0900, FUJITA Tomonori wrote:
> If q->elevator is NULL, the media-bay code might mess up the ref
> counting of the request queue...
Well, all I do is call into Bart's new helpers to scan for or unregister
devices ...
Ben.
^ permalink raw reply
* Re: ide pmac breakage
From: FUJITA Tomonori @ 2008-07-29 5:17 UTC (permalink / raw)
To: bzolnier; +Cc: linuxppc-dev, petkovbb, fujita.tomonori, linux-ide
In-Reply-To: <200807281631.56446.bzolnier@gmail.com>
On Mon, 28 Jul 2008 16:31:56 +0200
Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> wrote:
> > > However, the machine crashes when removing the media-bay CD-ROM drive.
> > >
> > > Crash appears to be a NULL deref, possibly in elv_may_queue() though
> > > I don't have a clean backtrace yet, working on it...
>
> I wonder whether conversion from on-stack struct requests to allocated
> ones may have something to do with it (or not?)...
It might be. q->elevator is NULL?
I think that everyone goes through this path (generic_ide_remove ->
ide_cd_release -> cdrom_get_disc_info ->...). With 2.6.27-rc1, I've
just tried this path by removing ide-cd module, and it's fine.
If q->elevator is NULL, the media-bay code might mess up the ref
counting of the request queue...
> > Here's a backtrace:
> >
> > Vector: 300 (Data Access) at [c58b7b80]
> > pc: c014f264: elv_may_queue+0x10/0x44
> > lr: c0152750: get_request+0x2c/0x2c0
> > sp: c58b7c30
> > msr: 1032
> > dar: c
> > dsisr: 40000000
> > current = 0xc58aaae0
> > pid = 854, comm = media-bay
> > enter ? for help
> > mon> t
> > [c58b7c40] c0152750 get_request+0x2c/0x2c0
> > [c58b7c70] c0152a08 get_request_wait+0x24/0xec
> > [c58b7cc0] c0225674 ide_cd_queue_pc+0x58/0x1a0
> > [c58b7d40] c022672c ide_cdrom_packet+0x9c/0xdc
> > [c58b7d70] c0261810 cdrom_get_disc_info+0x60/0xd0
> > [c58b7dc0] c026208c cdrom_mrw_exit+0x1c/0x11c
> > [c58b7e30] c0260f7c unregister_cdrom+0x84/0xe8
> > [c58b7e50] c022395c ide_cd_release+0x80/0x84
> > [c58b7e70] c0163650 kref_put+0x54/0x6c
> > [c58b7e80] c0223884 ide_cd_put+0x40/0x5c
> > [c58b7ea0] c0211100 generic_ide_remove+0x28/0x3c
> > [c58b7eb0] c01e9d34 __device_release_driver+0x78/0xb4
> > [c58b7ec0] c01e9e44 device_release_driver+0x28/0x44
> > [c58b7ee0] c01e8f7c bus_remove_device+0xac/0xd8
> > [c58b7f00] c01e7424 device_del+0x104/0x198
> > [c58b7f20] c01e74d0 device_unregister+0x18/0x30
> > [c58b7f40] c02121c4 __ide_port_unregister_devices+0x6c/0x88
> > [c58b7f60] c0212398 ide_port_unregister_devices+0x38/0x80
> > [c58b7f80] c0208ca4 media_bay_step+0x1cc/0x5c0
> > [c58b7fb0] c0209124 media_bay_task+0x8c/0xcc
> > [c58b7fd0] c00485c0 kthread+0x48/0x84
> > [c58b7ff0] c0011b20 kernel_thread+0x44/0x60
>
>
^ permalink raw reply
* Re: No output from SMC1 console with the 2.6.26 kernel (PQ2FADS based board)
From: Matvejchikov Ilya @ 2008-07-29 6:10 UTC (permalink / raw)
To: Scott Wood; +Cc: linuxppc-embedded
In-Reply-To: <488E2510.7070209@freescale.com>
No, it's not working for me :(
My pins is configured by u-boot so I disable init_ioports() function
call. Moreover the udbg0 console forks fine... I have no output at all
after "udbg_putc = NULL" line in the cpm_uart driver. As I see it the
cpm_uart driver doesn't run properly after udbg console has turned
off.....
2008/7/28 Scott Wood <scottwood@freescale.com>:
> Matvejchikov Ilya wrote:
>>
>> cpm@119c0 {
>> #address-cells = <1>;
>> #size-cells = <1>;
>> #interrupt-cells = <2>;
>> compatible = "fsl,mpc8280-cpm", "fsl,cpm2";
>
> Add "simple-bus" to this compatible list.
>
> Other than that, and that you should be using dts-v1, the tree looks fine.
> If adding "simple-bus" doesn't fix it, check your pin setup; pq2fads
> doesn't have an SMC serial port, so its platform file doesn't set up those
> pins.
>
> -Scott
>
>
^ permalink raw reply
* Re: [PATCH] powerpc/lpar - defer prefered console setup
From: Bastian Blank @ 2008-07-29 7:36 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: linuxppc-dev, akpm, linux-kernel
In-Reply-To: <1217300778.11188.233.camel@pasglop>
On Tue, Jul 29, 2008 at 01:06:18PM +1000, Benjamin Herrenschmidt wrote:
> On Mon, 2008-07-28 at 20:56 +0200, Bastian Blank wrote:
> > Hi
> >
> > The powerpc lpar code adds a prefered console at a very early state,
> > during arch_setup. This runs even before the console setup from the
> > command line and takes preference.
> >
> > This patch moves the prefered console setup into an arch_initcall which
> > runs later and allows the specification of the correct console on the
> > command line. The udbg console remains as boot console.
> >
> Shouldn't it be a console_initcall() ?
No. console_initcall is for the initial console setup and runs way long
before the command line setup. It needs to run after that.
> > There is a different problem that the code does not pick up the correct
> > console because it uses a part (4) of the lpar device number (30000004)
> > instead of the correct index 1.
> Now, regarding the "different problem" I think it's even worse than
> that, looking at the code there's some non sensical things in here...
>
> add_preferred_console() argument is what gets compared to
> console->index, right ? Now if you look at hvc_instantiate(),
> it compares each "index" argument passed in to hvc_con_driver.index,
> and that index argument passed from hvc_find_vtys() has strictly
> nothing to do with the vtermno, it's purely the index of the node
> found in order...
>
> So I think the whole stuff is non-sensical and needs fixing.
Yep. Would it be a solution to check this in hvc_vio and hvsi and do the
calls there? They now that the device is available and the correct
index. But even then it have to run after the command line. (Or the
console infrastructure fixed to support more then one device of a type.)
Bastian
--
Peace was the way.
-- Kirk, "The City on the Edge of Forever", stardate unknown
^ permalink raw reply
* Re: [PATCH] powerpc/lpar - defer prefered console setup
From: Benjamin Herrenschmidt @ 2008-07-29 7:43 UTC (permalink / raw)
To: Bastian Blank; +Cc: linuxppc-dev, akpm, linux-kernel
In-Reply-To: <20080729073611.GA30627@wavehammer.waldi.eu.org>
On Tue, 2008-07-29 at 09:36 +0200, Bastian Blank wrote:
> On Tue, Jul 29, 2008 at 01:06:18PM +1000, Benjamin Herrenschmidt wrote:
> > On Mon, 2008-07-28 at 20:56 +0200, Bastian Blank wrote:
> > > Hi
> > >
> > > The powerpc lpar code adds a prefered console at a very early state,
> > > during arch_setup. This runs even before the console setup from the
> > > command line and takes preference.
> > >
> > > This patch moves the prefered console setup into an arch_initcall which
> > > runs later and allows the specification of the correct console on the
> > > command line. The udbg console remains as boot console.
> > >
> > Shouldn't it be a console_initcall() ?
>
> No. console_initcall is for the initial console setup and runs way long
> before the command line setup. It needs to run after that.
Hrm... we do most of the console discovery from console_initcall for
legacy UARTs. see the code in legacy_serial.c, we just avoid doing
the add_preferred_console() thingy if there's a console= on the command
line :-)
> Yep. Would it be a solution to check this in hvc_vio and hvsi and do the
> calls there? They now that the device is available and the correct
> index. But even then it have to run after the command line. (Or the
> console infrastructure fixed to support more then one device of a type.)
Not sure. The console selection process is just plain weird and I never
really took the time to fully figure it out.
Ben.
^ permalink raw reply
* Re: [PATCH] powerpc/lpar - defer prefered console setup
From: Bastian Blank @ 2008-07-29 8:07 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: linuxppc-dev, akpm, linux-kernel
In-Reply-To: <1217317404.11188.242.camel@pasglop>
On Tue, Jul 29, 2008 at 05:43:24PM +1000, Benjamin Herrenschmidt wrote:
> On Tue, 2008-07-29 at 09:36 +0200, Bastian Blank wrote:
> > On Tue, Jul 29, 2008 at 01:06:18PM +1000, Benjamin Herrenschmidt wrote:
> > > On Mon, 2008-07-28 at 20:56 +0200, Bastian Blank wrote:
> > > > Hi
> > > >
> > > > The powerpc lpar code adds a prefered console at a very early state,
> > > > during arch_setup. This runs even before the console setup from the
> > > > command line and takes preference.
> > > >
> > > > This patch moves the prefered console setup into an arch_initcall which
> > > > runs later and allows the specification of the correct console on the
> > > > command line. The udbg console remains as boot console.
> > > >
> > > Shouldn't it be a console_initcall() ?
> >
> > No. console_initcall is for the initial console setup and runs way long
> > before the command line setup. It needs to run after that.
>
> Hrm... we do most of the console discovery from console_initcall for
> legacy UARTs. see the code in legacy_serial.c, we just avoid doing
> the add_preferred_console() thingy if there's a console= on the command
> line :-)
The code did that, but the check was removed because it trips on
netconsole=. See 5faae2e5d1f53df9dce482032c8486bc3a1feffc.
Bastian
--
The heart is not a logical organ.
-- Dr. Janet Wallace, "The Deadly Years", stardate 3479.4
^ permalink raw reply
* No output from SCC1 console
From: Fabien Oriede @ 2008-07-29 8:47 UTC (permalink / raw)
To: linuxppc-embedded
[-- Attachment #1: Type: text/plain, Size: 3639 bytes --]
Hi all,
I'm working with a custom board (MPC860T, 8MB FLASH, 4MB SDRAM, serial port on SCC1). I have ported U-Boot on my board, SCC1 is used as UART and I can see all messages on my terminal. Now I'm porting the Linux kernel 2.6.24 and when I use the command "bootm ffa00000" (uImage is at 0xFFA00000), no message from linux appear on the terminal. I work with the base of the TQM860L. When I have compiled my kernel, I have activated the option to use SCC1 as UART, the console on the UART, and changed the IMMAP_ADDR to get the same address as IMMR in U-Boot. In my U-Boot's environnement variables, I have "bootargs=console=ttyS0,38400". Even if I don't have messages on the terminal, I have acces to the "log_buf" variable in SDRAM and the contents is :< 5 > Linux version 2.6.24 (root@localhost.localdomain) (gcc version 4.0.0 (DENX ELDK 4.1 4.0.0)) #25 Sun Feb 6 14:03:59 CET 2011 –
< 7 > Entering add_active_range(0, 0, 1024) 0 entries of 256 used –
< 4 > Zone PFN ranges: -
< 4 > DMA0 ->1024 –
< 4 > Normal 1024 ->1024 –
< 4 > Movable zone start PFN for each node –
< 4 > early_node_map[1] active PFN ranges –
< 4 > 0:0 -> 1024 –
< 7 > On node0 total pages : 1024 –
< 7 > DMA zone : 8 pages used for memmap –
< 7 > DMA zone : 0 pages reserved –
< 7 > DMA zone : 1016 pages, LIFO batch : 0 –
< 7 > Normal zone : 0 pages used for memmap –
< 7 > Movable zone : 0 pages used for memmap –
< 4 > Built1 zonelists in Zone order, mobility grouping off. Total pages : 1016 –
< 5 > Kernel command line : -
< 4 > PID hash table entries : 16 (order : 4, 64 bytes) –
< 4 > Decrementer Frequency = 150000000/60 –
< 4 > Console : colour dummy device 80x25 –
< 6 > console [tty0] enabled –
< 6 > Dentry cache hash table entries : 1024 (order : 0, 4096 bytes) –
< 6 > Inode-cache hash table entries : 1024 (order : 0, 4096 bytes) –
< 4 > Memory : 2636k available (1084k kernel code, 260k data, 56k init, 0k highmem) –
< 6 > SLUB : Genslabs=11, HWalign=16, Order=0-1, MinObjects=4, CPUs=1, Nodes=1 –
< 7 > Calibrating delay loop...39.55 BogoMIPS(lpj=79104) –
< 4 > Mount-cache hashtable entries : 512 –
< 6 > io scheduler noop registered –
< 6 > io scheduler anticipatory registered –
< 6 > io scheduler deadline registered –
< 6 > io scheduler cfq registered (default) –
< 6 > Generic RTC Driver v1.07 –
< 6 > Serial : CPM driver $Revision : 0.02 $ -
< 6 > cpm_uart : WARNING : no UART devices found on platorm bus! –
< 6 > cpm_uart : the driver will guess configuration, but this mode is no longer supported. –
< 6 > ttyCPM0 at MMIO 0xffe00a00 (irq = 46) is a CPM UART –
< 3 > i8042.c : No controller found. –
< 6 > mice : PS/2 mouse device common for all mice –
< 4 > VFS : Cannot open rootdevice "<NULL>"or unknown-block(0,0) –
< 4 > Please append a correct "root=" boot option; here are the available partitions : -
< 0 > Kernel panic – notsyncing : VFS : Unable to mount root fs on unknown-block(0,0) –
< 0 > Rebooting in 180seconds.. - - - - - - - - - - - - - - - - - - - - - - -
In this log, it seems that I have 2 problems, UART and FileSystem. At this moment, I'm not using an initrd image. I will use it in the futur, I hope that the problem with the UART is not due to the non use of the initrd image.
Someone can help me with my UART problem please ?
Thanks.
_____________________________________________________________________________
Envoyez avec Yahoo! Mail. Une boite mail plus intelligente http://mail.yahoo.fr
[-- Attachment #2: Type: text/html, Size: 13546 bytes --]
^ permalink raw reply
* Re: [PATCH] powerpc/lpar - defer prefered console setup
From: Benjamin Herrenschmidt @ 2008-07-29 9:00 UTC (permalink / raw)
To: Bastian Blank; +Cc: linuxppc-dev, akpm, linux-kernel
In-Reply-To: <20080729080727.GA32595@wavehammer.waldi.eu.org>
On Tue, 2008-07-29 at 10:07 +0200, Bastian Blank wrote:
> > Hrm... we do most of the console discovery from console_initcall for
> > legacy UARTs. see the code in legacy_serial.c, we just avoid doing
> > the add_preferred_console() thingy if there's a console= on the
> command
> > line :-)
>
> The code did that, but the check was removed because it trips on
> netconsole=. See 5faae2e5d1f53df9dce482032c8486bc3a1feffc.
Argh. That's a mess. Well, legacy_serial still does that :-)
Ben.
^ permalink raw reply
* Re: No output from SCC1 console
From: Jochen Friedrich @ 2008-07-29 9:19 UTC (permalink / raw)
To: Fabien Oriede; +Cc: linuxppc-embedded
In-Reply-To: <828666.17571.qm@web27407.mail.ukl.yahoo.com>
Hi Fabien,
> In my
> U-Boot's environnement variables, I have "bootargs=console=ttyS0,38400".
Make this console=ttyCPM0,38400
> < 6 > ttyCPM0 at MMIO 0xffe00a00 (irq = 46) is a CPM UART –
Thanks,
Jochen
^ permalink raw reply
* Re : No output from SCC1 console
From: Fabien Oriede @ 2008-07-29 9:48 UTC (permalink / raw)
To: Jochen Friedrich; +Cc: linuxppc-embedded
[-- Attachment #1: Type: text/plain, Size: 956 bytes --]
Hi Jochen,
Thanks for your answer, now I have all messages of my "log_buf" on my terminal.
I will now go to put a filesystem on my board.
Fabien.
----- Message d'origine ----
De : Jochen Friedrich <jochen@scram.de>
À : Fabien Oriede <fabien.oriede@yahoo.fr>
Cc : linuxppc-embedded@ozlabs.org
Envoyé le : Mardi, 29 Juillet 2008, 11h19mn 19s
Objet : Re: No output from SCC1 console
Hi Fabien,
> In my
> U-Boot's environnement variables, I have "bootargs=console=ttyS0,38400".
Make this console=ttyCPM0,38400
> < 6 > ttyCPM0 at MMIO 0xffe00a00 (irq = 46) is a CPM UART –
Thanks,
Jochen
_______________________________________________
Linuxppc-embedded mailing list
Linuxppc-embedded@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-embedded
_____________________________________________________________________________
Envoyez avec Yahoo! Mail. Une boite mail plus intelligente http://mail.yahoo.fr
[-- Attachment #2: Type: text/html, Size: 1910 bytes --]
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox