[PATCH] trivial: modify comments to refer to new location of files
Jon Mason
jdmason at us.ibm.com
Fri Jan 13 05:02:40 EST 2006
Trivial patch to modify the references to the now defunct ppc64 tree to
the powerpc tree (and related changes to accommodate for 70 char lines).
Thanks,
Jon
Signed-off-by: Jon Mason <jdmason at us.ibm.com>
diff -r 2e15034efcb7 Documentation/powerpc/eeh-pci-error-recovery.txt
--- a/Documentation/powerpc/eeh-pci-error-recovery.txt Wed Jan 11 16:14:16 2006
+++ b/Documentation/powerpc/eeh-pci-error-recovery.txt Thu Jan 12 08:25:34 2006
@@ -121,7 +121,7 @@
EEH must be enabled in the PHB's very early during the boot process,
and if a PCI slot is hot-plugged. The former is performed by
-eeh_init() in arch/ppc64/kernel/eeh.c, and the later by
+eeh_init() in arch/powerpc/platforms/pseries/eeh.c, and the later by
drivers/pci/hotplug/pSeries_pci.c calling in to the eeh.c code.
EEH must be enabled before a PCI scan of the device can proceed.
Current Power5 hardware will not work unless EEH is enabled;
@@ -133,7 +133,7 @@
pci_get_device_by_addr() will find the pci device associated
with that address (if any).
-The default include/asm-ppc64/io.h macros readb(), inb(), insb(),
+The default include/asm-powerpc/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
@@ -143,11 +143,12 @@
all of these occur during boot, when the PCI bus is scanned, where
a large number of 0xff reads are part of the bus scan procedure.
-If a frozen slot is detected, code in arch/ppc64/kernel/eeh.c will
-print a stack trace to syslog (/var/log/messages). This stack trace
-has proven to be very useful to device-driver authors for finding
-out at what point the EEH error was detected, as the error itself
-usually occurs slightly beforehand.
+If a frozen slot is detected, code in
+arch/powerpc/platforms/pseries/eeh.c will print a stack trace to
+syslog (/var/log/messages). This stack trace has proven to be very
+useful to device-driver authors for finding out at what point the EEH
+error was detected, as the error itself usually occurs slightly
+beforehand.
Next, it uses the Linux kernel notifier chain/work queue mechanism to
allow any interested parties to find out about the failure. Device
diff -r 2e15034efcb7 arch/powerpc/boot/install.sh
--- a/arch/powerpc/boot/install.sh Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/boot/install.sh Thu Jan 12 08:25:34 2006
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# arch/ppc64/boot/install.sh
+# arch/powerpc/boot/install.sh
#
# This file is subject to the terms and conditions of the GNU General Public
# License. See the file "COPYING" in the main directory of this archive
diff -r 2e15034efcb7 arch/powerpc/kernel/entry_64.S
--- a/arch/powerpc/kernel/entry_64.S Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/kernel/entry_64.S Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc64/kernel/entry.S
+ * arch/powerpc/kernel/entry_64.S
*
* PowerPC version
* Copyright (C) 1995-1996 Gary Thomas (gdt at linuxppc.org)
@@ -374,7 +374,7 @@
* the fork code also.
*
* The code which creates the new task context is in 'copy_thread'
- * in arch/ppc64/kernel/process.c
+ * in arch/powerpc/kernel/process.c
*/
.align 7
_GLOBAL(_switch)
diff -r 2e15034efcb7 arch/powerpc/kernel/head_44x.S
--- a/arch/powerpc/kernel/head_44x.S Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/kernel/head_44x.S Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc/kernel/head_44x.S
+ * arch/powerpc/kernel/head_44x.S
*
* Kernel execution entry point code.
*
diff -r 2e15034efcb7 arch/powerpc/kernel/head_64.S
--- a/arch/powerpc/kernel/head_64.S Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/kernel/head_64.S Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc64/kernel/head.S
+ * arch/powerpc/kernel/head_64.S
*
* PowerPC version
* Copyright (C) 1995-1996 Gary Thomas (gdt at linuxppc.org)
diff -r 2e15034efcb7 arch/powerpc/kernel/head_8xx.S
--- a/arch/powerpc/kernel/head_8xx.S Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/kernel/head_8xx.S Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc/kernel/except_8xx.S
+ * arch/powerpc/kernel/head_8xx.S
*
* PowerPC version
* Copyright (C) 1995-1996 Gary Thomas (gdt at linuxppc.org)
diff -r 2e15034efcb7 arch/powerpc/kernel/head_fsl_booke.S
--- a/arch/powerpc/kernel/head_fsl_booke.S Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/kernel/head_fsl_booke.S Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc/kernel/head_fsl_booke.S
+ * arch/powerpc/kernel/head_fsl_booke.S
*
* Kernel execution entry point code.
*
diff -r 2e15034efcb7 arch/powerpc/kernel/iomap.c
--- a/arch/powerpc/kernel/iomap.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/kernel/iomap.c Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc64/kernel/iomap.c
+ * arch/powerpc/kernel/iomap.c
*
* ppc64 "iomap" interface implementation.
*
diff -r 2e15034efcb7 arch/powerpc/kernel/iommu.c
--- a/arch/powerpc/kernel/iommu.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/kernel/iommu.c Thu Jan 12 08:25:34 2006
@@ -1,5 +1,6 @@
/*
- * arch/ppc64/kernel/iommu.c
+ * arch/powerpc/kernel/iommu.c
+ *
* Copyright (C) 2001 Mike Corrigan & Dave Engebretsen, IBM Corporation
*
* Rewrite, cleanup, new allocation schemes, virtual merging:
diff -r 2e15034efcb7 arch/powerpc/kernel/irq.c
--- a/arch/powerpc/kernel/irq.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/kernel/irq.c Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc/kernel/irq.c
+ * arch/powerpc/kernel/irq.c
*
* Derived from arch/i386/kernel/irq.c
* Copyright (C) 1992 Linus Torvalds
diff -r 2e15034efcb7 arch/powerpc/kernel/kprobes.c
--- a/arch/powerpc/kernel/kprobes.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/kernel/kprobes.c Thu Jan 12 08:25:34 2006
@@ -1,6 +1,6 @@
/*
* Kernel Probes (KProbes)
- * arch/ppc64/kernel/kprobes.c
+ * arch/powerpc/kernel/kprobes.c
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff -r 2e15034efcb7 arch/powerpc/kernel/pci_iommu.c
--- a/arch/powerpc/kernel/pci_iommu.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/kernel/pci_iommu.c Thu Jan 12 08:25:34 2006
@@ -1,5 +1,6 @@
/*
- * arch/ppc64/kernel/pci_iommu.c
+ * arch/powerpc/kernel/pci_iommu.c
+ *
* Copyright (C) 2001 Mike Corrigan & Dave Engebretsen, IBM Corporation
*
* Rewrite, cleanup, new allocation schemes:
diff -r 2e15034efcb7 arch/powerpc/kernel/process.c
--- a/arch/powerpc/kernel/process.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/kernel/process.c Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc/kernel/process.c
+ * arch/powerpc/kernel/process.c
*
* Derived from "arch/i386/kernel/process.c"
* Copyright (C) 1995 Linus Torvalds
diff -r 2e15034efcb7 arch/powerpc/kernel/ptrace-common.h
--- a/arch/powerpc/kernel/ptrace-common.h Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/kernel/ptrace-common.h Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * linux/arch/ppc64/kernel/ptrace-common.h
+ * arch/powerpc/kernel/ptrace-common.h
*
* Copyright (c) 2002 Stephen Rothwell, IBM Coproration
* Extracted from ptrace.c and ptrace32.c
diff -r 2e15034efcb7 arch/powerpc/kernel/rtas-proc.c
--- a/arch/powerpc/kernel/rtas-proc.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/kernel/rtas-proc.c Thu Jan 12 08:25:34 2006
@@ -1,5 +1,6 @@
/*
- * arch/ppc64/kernel/rtas-proc.c
+ * arch/powerpc/kernel/rtas-proc.c
+ *
* Copyright (C) 2000 Tilmann Bitterberg
* (tilmann at bitterberg.de)
*
diff -r 2e15034efcb7 arch/powerpc/kernel/rtas_pci.c
--- a/arch/powerpc/kernel/rtas_pci.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/kernel/rtas_pci.c Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc64/kernel/rtas_pci.c
+ * arch/powerpc/kernel/rtas_pci.c
*
* Copyright (C) 2001 Dave Engebretsen, IBM Corporation
* Copyright (C) 2003 Anton Blanchard <anton at au.ibm.com>, IBM
diff -r 2e15034efcb7 arch/powerpc/kernel/signal_64.c
--- a/arch/powerpc/kernel/signal_64.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/kernel/signal_64.c Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * linux/arch/ppc64/kernel/signal.c
+ * arch/powerpc/kernel/signal_64.c
*
* PowerPC version
* Copyright (C) 1995-1996 Gary Thomas (gdt at linuxppc.org)
diff -r 2e15034efcb7 arch/powerpc/kernel/vdso.c
--- a/arch/powerpc/kernel/vdso.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/kernel/vdso.c Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * linux/arch/ppc64/kernel/vdso.c
+ * arch/powerpc/kernel/vdso.c
*
* Copyright (C) 2004 Benjamin Herrenschmidt, IBM Corp.
* <benh at kernel.crashing.org>
diff -r 2e15034efcb7 arch/powerpc/lib/copypage_64.S
--- a/arch/powerpc/lib/copypage_64.S Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/lib/copypage_64.S Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc64/lib/copypage.S
+ * arch/powerpc/lib/copypage_64.S
*
* Copyright (C) 2002 Paul Mackerras, IBM Corp.
*
diff -r 2e15034efcb7 arch/powerpc/lib/copyuser_64.S
--- a/arch/powerpc/lib/copyuser_64.S Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/lib/copyuser_64.S Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc64/lib/copyuser.S
+ * arch/powerpc/lib/copyuser_64.S
*
* Copyright (C) 2002 Paul Mackerras, IBM Corp.
*
diff -r 2e15034efcb7 arch/powerpc/lib/e2a.c
--- a/arch/powerpc/lib/e2a.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/lib/e2a.c Thu Jan 12 08:25:34 2006
@@ -1,9 +1,9 @@
/*
- * arch/ppc64/lib/e2a.c
+ * arch/powerpc/lib/e2a.c
*
* EBCDIC to ASCII conversion
*
- * This function moved here from arch/ppc64/kernel/viopath.c
+ * This function moved here from arch/powerpc/platforms/iseries/viopath.c
*
* (C) Copyright 2000-2004 IBM Corporation
*
diff -r 2e15034efcb7 arch/powerpc/lib/memcpy_64.S
--- a/arch/powerpc/lib/memcpy_64.S Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/lib/memcpy_64.S Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc64/lib/memcpy.S
+ * arch/powerpc/lib/memcpy_64.S
*
* Copyright (C) 2002 Paul Mackerras, IBM Corp.
*
diff -r 2e15034efcb7 arch/powerpc/lib/rheap.c
--- a/arch/powerpc/lib/rheap.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/lib/rheap.c Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc/syslib/rheap.c
+ * arch/powerpc/lib/rheap.c
*
* A Remote Heap. Remote means that we don't touch the memory that the
* heap points to. Normal heap implementations use the memory they manage
diff -r 2e15034efcb7 arch/powerpc/mm/fault.c
--- a/arch/powerpc/mm/fault.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/mm/fault.c Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc/mm/fault.c
+ * arch/powerpc/mm/fault.c
*
* PowerPC version
* Copyright (C) 1995-1996 Gary Thomas (gdt at linuxppc.org)
diff -r 2e15034efcb7 arch/powerpc/mm/hash_low_32.S
--- a/arch/powerpc/mm/hash_low_32.S Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/mm/hash_low_32.S Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc/kernel/hashtable.S
+ * arch/powerpc/mm/hash_low_32.S
*
* $Id: hashtable.S,v 1.6 1999/10/08 01:56:15 paulus Exp $
*
diff -r 2e15034efcb7 arch/powerpc/mm/mmap.c
--- a/arch/powerpc/mm/mmap.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/mm/mmap.c Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * linux/arch/ppc64/mm/mmap.c
+ * arch/powerpc/mm/mmap.c
*
* flexible mmap layout support
*
diff -r 2e15034efcb7 arch/powerpc/mm/mmu_decl.h
--- a/arch/powerpc/mm/mmu_decl.h Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/mm/mmu_decl.h Thu Jan 12 08:25:34 2006
@@ -1,6 +1,6 @@
/*
* Declarations of procedures and variables shared between files
- * in arch/ppc/mm/.
+ * in arch/powerpc/mm/.
*
* Derived from arch/ppc/mm/init.c:
* Copyright (C) 1995-1996 Gary Thomas (gdt at linuxppc.org)
diff -r 2e15034efcb7 arch/powerpc/mm/slb_low.S
--- a/arch/powerpc/mm/slb_low.S Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/mm/slb_low.S Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc64/mm/slb_low.S
+ * arch/powerpc/mm/slb_low.S
*
* Low-level SLB routines
*
diff -r 2e15034efcb7 arch/powerpc/mm/tlb_64.c
--- a/arch/powerpc/mm/tlb_64.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/mm/tlb_64.c Thu Jan 12 08:25:34 2006
@@ -36,7 +36,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-ppc64/tlb.h file -- tgall
+ * include/asm-powerpc/tlb.h file -- tgall
*/
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
DEFINE_PER_CPU(struct pte_freelist_batch *, pte_freelist_cur);
diff -r 2e15034efcb7 arch/powerpc/platforms/chrp/pegasos_eth.c
--- a/arch/powerpc/platforms/chrp/pegasos_eth.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/platforms/chrp/pegasos_eth.c Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc/platforms/chrp_pegasos_eth.c
+ * arch/powerpc/platforms/chrp/pegasos_eth.c
*
* Copyright (C) 2005 Sven Luther <sl at bplan-gmbh.de>
* Thanks to :
diff -r 2e15034efcb7 arch/powerpc/platforms/chrp/setup.c
--- a/arch/powerpc/platforms/chrp/setup.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/platforms/chrp/setup.c Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc/platforms/setup.c
+ * arch/powerpc/platforms/chrp/setup.c
*
* Copyright (C) 1995 Linus Torvalds
* Adapted from 'alpha' version by Gary Thomas
diff -r 2e15034efcb7 arch/powerpc/platforms/chrp/time.c
--- a/arch/powerpc/platforms/chrp/time.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/platforms/chrp/time.c Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc/platforms/chrp_time.c
+ * arch/powerpc/platforms/chrp/time.c
*
* Copyright (C) 1991, 1992, 1995 Linus Torvalds
*
diff -r 2e15034efcb7 arch/powerpc/platforms/maple/time.c
--- a/arch/powerpc/platforms/maple/time.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/platforms/maple/time.c Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc64/kernel/maple_time.c
+ * arch/powerpc/platforms/maple/time.c
*
* (c) Copyright 2004 Benjamin Herrenschmidt (benh at kernel.crashing.org),
* IBM Corp.
diff -r 2e15034efcb7 arch/powerpc/platforms/powermac/cpufreq_32.c
--- a/arch/powerpc/platforms/powermac/cpufreq_32.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/platforms/powermac/cpufreq_32.c Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc/platforms/pmac_cpufreq.c
+ * arch/powerpc/platforms/powermac/cpufreq_32.c
*
* Copyright (C) 2002 - 2005 Benjamin Herrenschmidt <benh at kernel.crashing.org>
* Copyright (C) 2004 John Steele Scott <toojays at toojays.net>
diff -r 2e15034efcb7 arch/powerpc/platforms/powermac/feature.c
--- a/arch/powerpc/platforms/powermac/feature.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/platforms/powermac/feature.c Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc/platforms/pmac_feature.c
+ * arch/powerpc/platforms/powermac/feature.c
*
* Copyright (C) 1996-2001 Paul Mackerras (paulus at cs.anu.edu.au)
* Ben. Herrenschmidt (benh at kernel.crashing.org)
diff -r 2e15034efcb7 arch/powerpc/platforms/powermac/nvram.c
--- a/arch/powerpc/platforms/powermac/nvram.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/platforms/powermac/nvram.c Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc/platforms/pmac_nvram.c
+ * arch/powerpc/platforms/powermac/nvram.c
*
* Copyright (C) 2002 Benjamin Herrenschmidt (benh at kernel.crashing.org)
*
diff -r 2e15034efcb7 arch/powerpc/platforms/pseries/hvCall.S
--- a/arch/powerpc/platforms/pseries/hvCall.S Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/platforms/pseries/hvCall.S Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc64/kernel/pSeries_hvCall.S
+ * arch/powerpc/platforms/pseries/hvCall.S
*
* This file contains the generic code to perform a call to the
* pSeries LPAR hypervisor.
diff -r 2e15034efcb7 arch/powerpc/platforms/pseries/iommu.c
--- a/arch/powerpc/platforms/pseries/iommu.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/platforms/pseries/iommu.c Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc64/kernel/pSeries_iommu.c
+ * arch/powerpc/platforms/pseries/iommu.c
*
* Copyright (C) 2001 Mike Corrigan & Dave Engebretsen, IBM Corporation
*
diff -r 2e15034efcb7 arch/powerpc/platforms/pseries/pci.c
--- a/arch/powerpc/platforms/pseries/pci.c Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/platforms/pseries/pci.c Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc64/kernel/pSeries_pci.c
+ * arch/powerpc/platforms/pseries/pci.c
*
* Copyright (C) 2001 Dave Engebretsen, IBM Corporation
* Copyright (C) 2003 Anton Blanchard <anton at au.ibm.com>, IBM
diff -r 2e15034efcb7 arch/powerpc/sysdev/dcr.S
--- a/arch/powerpc/sysdev/dcr.S Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/sysdev/dcr.S Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc/syslib/dcr.S
+ * arch/powerpc/sysdev/dcr.S
*
* "Indirect" DCR access
*
diff -r 2e15034efcb7 arch/powerpc/sysdev/ipic.h
--- a/arch/powerpc/sysdev/ipic.h Wed Jan 11 16:14:16 2006
+++ b/arch/powerpc/sysdev/ipic.h Thu Jan 12 08:25:34 2006
@@ -1,5 +1,5 @@
/*
- * arch/ppc/kernel/ipic.h
+ * arch/powerpc/sysdev/ipic.h
*
* IPIC private definitions and structure.
*
diff -r 2e15034efcb7 drivers/char/hvcs.c
--- a/drivers/char/hvcs.c Wed Jan 11 16:14:16 2006
+++ b/drivers/char/hvcs.c Thu Jan 12 08:25:34 2006
@@ -118,7 +118,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
- * arch/ppc64/hvcserver.h.
+ * include/asm-powerpc/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
@@ -168,9 +168,10 @@
/*
* The hcall interface involves putting 8 chars into each of two registers.
- * We load up those 2 registers (in arch/ppc64/hvconsole.c) by casting char[16]
- * to long[2]. It would work without __ALIGNED__, but a little (tiny) bit
- * slower because an unaligned load is slower than aligned load.
+ * We load up those 2 registers (in arch/powerpc/platforms/pseries/hvconsole.c)
+ * by casting char[16] to long[2]. It would work without __ALIGNED__, but a
+ * little (tiny) bit slower because an unaligned load is slower than aligned
+ * load.
*/
#define __ALIGNED__ __attribute__((__aligned__(8)))
diff -r 2e15034efcb7 include/asm-powerpc/paca.h
--- a/include/asm-powerpc/paca.h Wed Jan 11 16:14:16 2006
+++ b/include/asm-powerpc/paca.h Thu Jan 12 08:25:34 2006
@@ -53,7 +53,7 @@
#endif /* CONFIG_PPC_ISERIES */
/*
- * MAGIC: the spinlock functions in arch/ppc64/lib/locks.c
+ * MAGIC: the spinlock functions in arch/powerpc/lib/locks.c
* load lock_token and paca_index with a single lwz
* instruction. They must travel together and be properly
* aligned.
diff -r 2e15034efcb7 include/asm-powerpc/rwsem.h
--- a/include/asm-powerpc/rwsem.h Wed Jan 11 16:14:16 2006
+++ b/include/asm-powerpc/rwsem.h Thu Jan 12 08:25:34 2006
@@ -4,7 +4,7 @@
#ifdef __KERNEL__
/*
- * include/asm-ppc64/rwsem.h: R/W semaphores for PPC using the stuff
+ * 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
* by Paul Mackerras <paulus at samba.org>.
*/
diff -r 2e15034efcb7 kernel/auditsc.c
--- a/kernel/auditsc.c Wed Jan 11 16:14:16 2006
+++ b/kernel/auditsc.c Thu Jan 12 08:25:34 2006
@@ -958,7 +958,7 @@
*
* i386 no
* x86_64 no
- * ppc64 yes (see arch/ppc64/kernel/misc.S)
+ * ppc64 yes (see arch/powerpc/platforms/iseries/misc.S)
*
* This also happens with vm86 emulation in a non-nested manner
* (entries without exits), so this case must be caught.
More information about the Linuxppc64-dev
mailing list