Commit 2acb802b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  powerpc: Remove use of CONFIG_PPC_MERGE
  powerpc: Force printing of 'total_memory' to unsigned long long
  powerpc: Fix compiler warning in arch/powerpc/mm/mem.c
  powerpc: Move include files to arch/powerpc/include/asm
parents d8f4b819 9c4cb825

Documentation/powerpc/booting-without-of.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -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. 
---------

---------





   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 {

Documentation/powerpc/eeh-pci-error-recovery.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

arch/powerpc/Kconfig.debug

+1 −1
Original line number Original line Diff line number Diff line
@@ -97,7 +97,7 @@ config IRQSTACKS 




config VIRQ_DEBUG

config VIRQ_DEBUG

	bool "Expose hardware/virtual IRQ mapping via debugfs"

	bool "Expose hardware/virtual IRQ mapping via debugfs"

	depends on DEBUG_FS && PPC_MERGE

	depends on DEBUG_FS

	help

	help

	  This option will show the mapping relationship between hardware irq

	  This option will show the mapping relationship between hardware irq

	  numbers and virtual irq numbers. The mapping is exposed via debugfs

	  numbers and virtual irq numbers. The mapping is exposed via debugfs

arch/powerpc/boot/io.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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)

{

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE