Commit b8b572e1 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras

powerpc: Move include files to arch/powerpc/include/asm

from include/asm-powerpc.  This is the result of a

mkdir arch/powerpc/include/asm
git mv include/asm-powerpc/* arch/powerpc/include/asm

Followed by a few documentation/comment fixups and a couple of places
where <asm-powepc/...> was being used explicitly.  Of the latter only
one was outside the arch code and it is a driver only built for powerpc.
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 2b12a4c5
...@@ -278,7 +278,7 @@ it with special cases. ...@@ -278,7 +278,7 @@ it with special cases.
a 64-bit platform. a 64-bit platform.
d) request and get assigned a platform number (see 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: 32-bit embedded kernels:
...@@ -340,7 +340,7 @@ the block to RAM before passing it to the kernel. ...@@ -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 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: boot_param_header:
struct boot_param_header { struct boot_param_header {
......
...@@ -133,7 +133,7 @@ error. Given an arbitrary address, the routine ...@@ -133,7 +133,7 @@ error. Given an arbitrary address, the routine
pci_get_device_by_addr() will find the pci device associated pci_get_device_by_addr() will find the pci device associated
with that address (if any). 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. 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 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 asks the firmware if the all-ff's value is the sign of a true EEH
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
/* /*
* Low-level I/O routines. * 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) static inline int in_8(const volatile unsigned char *addr)
{ {
......
/* /*
* include/asm-powerpc/immap_qe.h
*
* QUICC Engine (QE) Internal Memory Map. * QUICC Engine (QE) Internal Memory Map.
* The Internal Memory Map for devices with QE on them. This * The Internal Memory Map for devices with QE on them. This
* is the superset of all QE devices (8360, etc.). * is the superset of all QE devices (8360, etc.).
......
/* /*
* include/asm-powerpc/ipic.h
*
* IPIC external definitions and structure. * IPIC external definitions and structure.
* *
* Maintainer: Kumar Gala <galak@kernel.crashing.org> * Maintainer: Kumar Gala <galak@kernel.crashing.org>
......
/* /*
* include/asm-powerpc/irqflags.h
*
* IRQ flags handling * IRQ flags handling
*/ */
#ifndef _ASM_IRQFLAGS_H #ifndef _ASM_IRQFLAGS_H
...@@ -10,7 +8,7 @@ ...@@ -10,7 +8,7 @@
/* /*
* Get definitions for raw_local_save_flags(x), etc. * Get definitions for raw_local_save_flags(x), etc.
*/ */
#include <asm-powerpc/hw_irq.h> #include <asm/hw_irq.h>
#else #else
#ifdef CONFIG_TRACE_IRQFLAGS #ifdef CONFIG_TRACE_IRQFLAGS
......
/* /*
* include/asm-powerpc/kgdb.h
*
* The PowerPC (32/64) specific defines / externs for KGDB. Based on * The PowerPC (32/64) specific defines / externs for KGDB. Based on
* the previous 32bit and 64bit specific files, which had the following * the previous 32bit and 64bit specific files, which had the following
* copyrights: * copyrights:
......
/* /*
* include/asm-powerpc/paca.h
*
* This control block defines the PACA which defines the processor * This control block defines the PACA which defines the processor
* specific data for each logical processor on the system. * specific data for each logical processor on the system.
* There are some pointers defined that are utilized by PLIC. * There are some pointers defined that are utilized by PLIC.
......
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
#define _PAGE_WRENABLE (_PAGE_RW | _PAGE_DIRTY) #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_NONE __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED)
#define PAGE_SHARED __pgprot(_PAGE_BASE | _PAGE_RW | _PAGE_USER) #define PAGE_SHARED __pgprot(_PAGE_BASE | _PAGE_RW | _PAGE_USER)
......
/* /*
* include/asm-powerpc/qe_ic.h
*
* Copyright (C) 2006 Freescale Semicondutor, Inc. All rights reserved. * Copyright (C) 2006 Freescale Semicondutor, Inc. All rights reserved.
* *
* Authors: Shlomi Gridish <gridish@freescale.com> * Authors: Shlomi Gridish <gridish@freescale.com>
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
/* /*
* include/asm-powerpc/rwsem.h: R/W semaphores for PPC using the stuff * R/W semaphores for PPC using the stuff in lib/rwsem.c.
* in lib/rwsem.c. Adapted largely from include/asm-i386/rwsem.h * Adapted largely from include/asm-i386/rwsem.h
* by Paul Mackerras <paulus@samba.org>. * by Paul Mackerras <paulus@samba.org>.
*/ */
......
/* /*
* include/asm-powerpc/ucc_fast.h
*
* Internal header file for UCC FAST unit routines. * Internal header file for UCC FAST unit routines.
* *
* Copyright (C) 2006 Freescale Semicondutor, Inc. All rights reserved. * Copyright (C) 2006 Freescale Semicondutor, Inc. All rights reserved.
......
/* /*
* include/asm-powerpc/uic.h
*
* IBM PPC4xx UIC external definitions and structure. * IBM PPC4xx UIC external definitions and structure.
* *
* Maintainer: David Gibson <dwg@au1.ibm.com> * Maintainer: David Gibson <dwg@au1.ibm.com>
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
DEFINE_PER_CPU(struct ppc64_tlb_batch, ppc64_tlb_batch); DEFINE_PER_CPU(struct ppc64_tlb_batch, ppc64_tlb_batch);
/* This is declared as we are using the more or less generic /* 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); DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
static DEFINE_PER_CPU(struct pte_freelist_batch *, pte_freelist_cur); static DEFINE_PER_CPU(struct pte_freelist_batch *, pte_freelist_cur);
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <asm/page.h> #include <asm/page.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/pci-bridge.h> #include <asm/pci-bridge.h>
#include <asm-powerpc/mpic.h> #include <asm/mpic.h>
#include <asm/mpc86xx.h> #include <asm/mpc86xx.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Ryan S. Arnold <rsa@us.ibm.com> * Ryan S. Arnold <rsa@us.ibm.com>
* *
* hvc_console header information: * 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 * and drivers/char/hvc_console.c
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
* the hvcs_final_close() function in order to get it out of the spinlock. * 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 * Rearranged hvcs_close(). Cleaned up some printks and did some housekeeping
* on the changelog. Removed local CLC_LENGTH and used HVCS_CLC_LENGTH from * 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 * 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 * prevent possible lockup with realtime scheduling as similarily pointed out by
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
*/ */
#include <asm-powerpc/system.h> #include <asm/system.h>
#include "ehca_classes.h" #include "ehca_classes.h"
#include "ehca_tools.h" #include "ehca_tools.h"
#include "ehca_qes.h" #include "ehca_qes.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment