Commit c36c63c5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Add missing sparsemem.h include
  powerpc/pci: mmap anonymous memory when legacy_mem doesn't exist
  powerpc/cell: Add missing #include for oprofile
  powerpc/ftrace: Fix math to calculate offset in TOC
  powerpc: Don't emulate mr. instructions
  powerpc/fsl-booke: Fix mapping functions to use phys_addr_t
  arch/powerpc: Eliminate double sizeof
  powerpc/cpm2: Fix set interrupt type
  powerpc/83xx: Fix TSEC0 workability on MPC8313E-RDB boards
  powerpc/83xx: Fix missing #{address,size}-cells in mpc8313erdb.dts
  powerpc/83xx: Build breakage for CONFIG_PM but no CONFIG_SUSPEND
parents 226b7910 0b2f8287

arch/powerpc/boot/dts/mpc8313erdb.dts

+4 −7
Original line number Diff line number Diff line
@@ -191,7 +191,8 @@ 
			interrupts = <37 0x8 36 0x8 35 0x8>;

			interrupt-parent = <&ipic>;

			tbi-handle = < &tbi0 >;

			phy-handle = < &phy1 >;

			/* Vitesse 7385 isn't on the MDIO bus */

			fixed-link = <1 1 1000 0 0>;

			fsl,magic-packet;



			mdio@24520 {
@@ -199,12 +200,6 @@ 
				#size-cells = <0>;

				compatible = "fsl,gianfar-mdio";

				reg = <0x24520 0x20>;

				phy1: ethernet-phy@1 {

					interrupt-parent = <&ipic>;

					interrupts = <19 0x8>;

					reg = <0x1>;

					device_type = "ethernet-phy";

				};

				phy4: ethernet-phy@4 {

					interrupt-parent = <&ipic>;

					interrupts = <20 0x8>;
@@ -219,6 +214,8 @@ 
		};



		enet1: ethernet@25000 {

			#address-cells = <1>;

			#size-cells = <1>;

			cell-index = <1>;

			device_type = "network";

			model = "eTSEC";

arch/powerpc/configs/83xx/mpc8313_rdb_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ CONFIG_CICADA_PHY=y 
# CONFIG_NATIONAL_PHY is not set

# CONFIG_STE10XP is not set

# CONFIG_LSI_ET1011C_PHY is not set

# CONFIG_FIXED_PHY is not set

CONFIG_FIXED_PHY=y

# CONFIG_MDIO_BITBANG is not set

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

arch/powerpc/kernel/ftrace.c

+3 −2
Original line number Diff line number Diff line
@@ -195,8 +195,9 @@ __ftrace_make_nop(struct module *mod, 
		return -EINVAL;

	}



	offset = (unsigned)((unsigned short)jmp[0]) << 16 |

		(unsigned)((unsigned short)jmp[1]);

	/* The bottom half is signed extended */

	offset = ((unsigned)((unsigned short)jmp[0]) << 16) +

		(int)((short)jmp[1]);



	DEBUGP(" %x ", offset);

arch/powerpc/kernel/pci-common.c

+15 −2
Original line number Diff line number Diff line
@@ -561,8 +561,21 @@ int pci_mmap_legacy_page_range(struct pci_bus *bus, 
		 (unsigned long long)(offset + size - 1));



	if (mmap_state == pci_mmap_mem) {

		if ((offset + size) > hose->isa_mem_size)

			return -ENXIO;

		/* Hack alert !

		 *

		 * Because X is lame and can fail starting if it gets an error trying

		 * to mmap legacy_mem (instead of just moving on without legacy memory

		 * access) we fake it here by giving it anonymous memory, effectively

		 * behaving just like /dev/zero

		 */

		if ((offset + size) > hose->isa_mem_size) {

			printk(KERN_DEBUG

			       "Process %s (pid:%d) mapped non-existing PCI legacy memory for 0%04x:%02x\n",

			       current->comm, current->pid, pci_domain_nr(bus), bus->number);

			if (vma->vm_flags & VM_SHARED)

				return shmem_zero_setup(vma);

			return 0;

		}

		offset += hose->isa_mem_phys;

	} else {

		unsigned long io_offset = (unsigned long)hose->io_base_virt - _IO_BASE;

arch/powerpc/lib/sstep.c

+2 −0
Original line number Diff line number Diff line
@@ -172,6 +172,8 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr) 
			}

			break;

		case 0x378:	/* orx */

			if (instr & 1)

				break;

			rs = (instr >> 21) & 0x1f;

			rb = (instr >> 11) & 0x1f;

			if (rs == rb) {		/* mr */

CRA Git | Maintained and supported by SUSTech CRA and CCSE