Merge tag 'powerpc-4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

c04a5880 · Linus Torvalds <[email protected]> · 2016-05-20 10:12:41 -07:00

Pull powerpc updates from Michael Ellerman:
 "Highlights:
   - Support for Power ISA 3.0 (Power9) Radix Tree MMU from Aneesh Kumar K.V
   - Live patching support for ppc64le (also merged via livepatching.git)

  Various cleanups & minor fixes from:
   - Aaro Koskinen, Alexey Kardashevskiy, Andrew Donnellan, Aneesh Kumar K.V,
     Chris Smart, Daniel Axtens, Frederic Barrat, Gavin Shan, Ian Munsie,
     Lennart Sorensen, Madhavan Srinivasan, Mahesh Salgaonkar, Markus Elfring,
     Michael Ellerman, Oliver O'Halloran, Paul Gortmaker, Paul Mackerras,
     Rashmica Gupta, Russell Currey, Suraj Jitindar Singh, Thiago Jung
     Bauermann, Valentin Rothberg, Vipin K Parashar.

  General:
   - Update LMB associativity index during DLPAR add/remove from Nathan
     Fontenot
   - Fix branching to OOL handlers in relocatable kernel from Hari Bathini
   - Add support for userspace Power9 copy/paste from Chris Smart
   - Always use STRICT_MM_TYPECHECKS from Michael Ellerman
   - Add mask of possible MMU features from Michael Ellerman

  PCI:
   - Enable pass through of NVLink to guests from Alexey Kardashevskiy
   - Cleanups in preparation for powernv PCI hotplug from Gavin Shan
   - Don't report error in eeh_pe_reset_and_recover() from Gavin Shan
   - Restore initial state in eeh_pe_reset_and_recover() from Gavin Shan
   - Revert "powerpc/eeh: Fix crash in eeh_add_device_early() on Cell"
     from Guilherme G Piccoli
   - Remove the dependency on EEH struct in DDW mechanism from Guilherme
     G Piccoli

  selftests:
   - Test cp_abort during context switch from Chris Smart
   - Add several tests for transactional memory support from Rashmica
     Gupta

  perf:
   - Add support for sampling interrupt register state from Anju T
   - Add support for unwinding perf-stackdump from Chandan Kumar

  cxl:
   - Configure the PSL for two CAPI ports on POWER8NVL from Philippe
     Bergheaud
   - Allow initialization on timebase sync failures from Frederic Barrat
   - Increase timeout for detection of AFU mmio hang from Frederic
     Barrat
   - Handle num_of_processes larger than can fit in the SPA from Ian
     Munsie
   - Ensure PSL interrupt is configured for contexts with no AFU IRQs
     from Ian Munsie
   - Add kernel API to allow a context to operate with relocate disabled
     from Ian Munsie
   - Check periodically the coherent platform function's state from
     Christophe Lombard

  Freescale:
   - Updates from Scott: "Contains 86xx fixes, minor device tree fixes,
     an erratum workaround, and a kconfig dependency fix."

* tag 'powerpc-4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (192 commits)
  powerpc/86xx: Fix PCI interrupt map definition
  powerpc/86xx: Move pci1 definition to the include file
  powerpc/fsl: Fix build of the dtb embedded kernel images
  powerpc/fsl: Fix rcpm compatible string
  powerpc/fsl: Remove FSL_SOC dependency from FSL_LBC
  powerpc/fsl-pci: Add a workaround for PCI 5 errata
  powerpc/fsl: Fix SPI compatible on t208xrdb and t1040rdb
  powerpc/powernv/npu: Add PE to PHB's list
  powerpc/powernv: Fix insufficient memory allocation
  powerpc/iommu: Remove the dependency on EEH struct in DDW mechanism
  Revert "powerpc/eeh: Fix crash in eeh_add_device_early() on Cell"
  powerpc/eeh: Drop unnecessary label in eeh_pe_change_owner()
  powerpc/eeh: Ignore handlers in eeh_pe_reset_and_recover()
  powerpc/eeh: Restore initial state in eeh_pe_reset_and_recover()
  powerpc/eeh: Don't report error in eeh_pe_reset_and_recover()
  Revert "powerpc/powernv: Exclude root bus in pnv_pci_reset_secondary_bus()"
  powerpc/powernv/npu: Enable NVLink pass through
  powerpc/powernv/npu: Rework TCE Kill handling
  powerpc/powernv/npu: Add set/unset window helpers
  powerpc/powernv/ioda2: Export debug helper pe_level_printk()
  ...

Commit: c04a5880299eab3da8c10547db96ea9cdffd44a6
Parents: a1c28b75 · 138a0764

Merge commit. Changes below are compared with the first parent: a1c28b75.

Changes

200 files changed · +6908 −3128

File	Status	Add	Del	Content
Documentation/ABI/testing/sysfs-class-cxl	modified	+8	−0	View file
Documentation/features/perf/perf-regs/arch-support.txt	modified	+1	−1	View file
Documentation/features/perf/perf-stackdump/arch-support.txt	modified	+1	−1	View file
Documentation/powerpc/eeh-pci-error-recovery.txt	modified	+1	−1	View file
MAINTAINERS	modified	+13	−0	View file
arch/powerpc/Kconfig	modified	+4	−3	View file
arch/powerpc/Kconfig.debug	modified	+0	−8	View file
arch/powerpc/boot/Makefile	modified	+3	−3	View file
arch/powerpc/boot/dts/fsl/gef_ppc9a.dts	modified	+4	−0	View file
arch/powerpc/boot/dts/fsl/gef_sbc310.dts	modified	+0	−22	View file
arch/powerpc/boot/dts/fsl/gef_sbc610.dts	modified	+4	−0	View file
arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts	modified	+1	−23	View file
arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts	modified	+1	−23	View file
arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi	modified	+34	−7	View file
arch/powerpc/boot/dts/fsl/mpc8641si-pre.dtsi	modified	+1	−0	View file
arch/powerpc/boot/dts/fsl/sbc8641d.dts	modified	+0	−23	View file
arch/powerpc/boot/dts/fsl/t1023si-post.dtsi	modified	+1	−1	View file
arch/powerpc/boot/dts/fsl/t1040si-post.dtsi	modified	+1	−1	View file
arch/powerpc/boot/dts/fsl/t104xrdb.dtsi	modified	+1	−1	View file
arch/powerpc/boot/dts/fsl/t208xrdb.dtsi	modified	+1	−1	View file
arch/powerpc/include/asm/book3s/32/hash.h	modified	+0	−3	View file
arch/powerpc/include/asm/book3s/32/mmu-hash.h	modified	+3	−3	View file
arch/powerpc/include/asm/book3s/32/pgalloc.h	added	+109	−0	View file
arch/powerpc/include/asm/book3s/64/hash-4k.h	modified	+74	−62	View file
arch/powerpc/include/asm/book3s/64/hash-64k.h	modified	+62	−153	View file
arch/powerpc/include/asm/book3s/64/hash.h	modified	+65	−420	View file
arch/powerpc/include/asm/book3s/64/hugetlb-radix.h	added	+14	−0	View file
arch/powerpc/include/asm/book3s/64/mmu-hash.h	modified	+17	−62	View file
arch/powerpc/include/asm/book3s/64/mmu.h	added	+137	−0	View file
arch/powerpc/include/asm/book3s/64/pgalloc.h	added	+207	−0	View file
arch/powerpc/include/asm/book3s/64/pgtable-4k.h	added	+53	−0	View file
arch/powerpc/include/asm/book3s/64/pgtable-64k.h	added	+64	−0	View file
arch/powerpc/include/asm/book3s/64/pgtable.h	modified	+739	−79	View file
arch/powerpc/include/asm/book3s/64/radix-4k.h	added	+12	−0	View file
arch/powerpc/include/asm/book3s/64/radix-64k.h	added	+12	−0	View file
arch/powerpc/include/asm/book3s/64/radix.h	added	+232	−0	View file
arch/powerpc/include/asm/book3s/64/tlbflush-hash.h	modified	+24	−17	View file
arch/powerpc/include/asm/book3s/64/tlbflush-radix.h	added	+33	−0	View file
arch/powerpc/include/asm/book3s/64/tlbflush.h	added	+76	−0	View file
arch/powerpc/include/asm/book3s/pgalloc.h	added	+19	−0	View file
arch/powerpc/include/asm/hugetlb.h	modified	+14	−0	View file
arch/powerpc/include/asm/kvm_book3s_64.h	modified	+13	−23	View file
arch/powerpc/include/asm/machdep.h	modified	+1	−0	View file
arch/powerpc/include/asm/mmu.h	modified	+39	−12	View file
arch/powerpc/include/asm/mmu_context.h	modified	+17	−12	View file
arch/powerpc/include/asm/pgalloc-32.h → arch/powerpc/include/asm/nohash/32/pgalloc.h	renamed	+0	−0	View file
arch/powerpc/include/asm/pgalloc-64.h → arch/powerpc/include/asm/nohash/64/pgalloc.h	renamed	+19	−73	View file
arch/powerpc/include/asm/nohash/64/pgtable.h	modified	+7	−3	View file
arch/powerpc/include/asm/nohash/pgalloc.h	added	+23	−0	View file
arch/powerpc/include/asm/opal-api.h	modified	+8	−8	View file
arch/powerpc/include/asm/page.h	modified	+13	−1	View file
arch/powerpc/include/asm/page_64.h	modified	+1	−4	View file
arch/powerpc/include/asm/pci-bridge.h	modified	+22	−19	View file
arch/powerpc/include/asm/pgalloc.h	modified	+3	−16	View file
arch/powerpc/include/asm/pgtable-be-types.h	added	+92	−0	View file
arch/powerpc/include/asm/pgtable-types.h	modified	+12	−46	View file
arch/powerpc/include/asm/ppc-opcode.h	modified	+2	−0	View file
arch/powerpc/include/asm/ppc-pci.h	modified	+3	−3	View file
arch/powerpc/include/asm/ppc_asm.h	modified	+3	−0	View file
arch/powerpc/include/asm/pte-common.h	modified	+19	−7	View file
arch/powerpc/include/asm/reg.h	modified	+3	−0	View file
arch/powerpc/include/asm/tlbflush.h	modified	+2	−1	View file
arch/powerpc/include/uapi/asm/perf_regs.h	added	+50	−0	View file
arch/powerpc/kernel/asm-offsets.c	modified	+4	−0	View file
arch/powerpc/kernel/btext.c	modified	+1	−1	View file
arch/powerpc/kernel/cputable.c	modified	+0	−2	View file
arch/powerpc/kernel/eeh.c	modified	+3	−6	View file
arch/powerpc/kernel/eeh_driver.c	modified	+30	−16	View file
arch/powerpc/kernel/eeh_event.c	modified	+1	−1	View file
arch/powerpc/kernel/eeh_pe.c	modified	+1	−1	View file
arch/powerpc/kernel/entry_64.S	modified	+14	−2	View file
arch/powerpc/kernel/exceptions-64s.S	modified	+40	−123	View file
arch/powerpc/kernel/ftrace.c	modified	+10	−0	View file
arch/powerpc/kernel/head_64.S	modified	+8	−5	View file
arch/powerpc/kernel/ibmebus.c	modified	+1	−1	View file
arch/powerpc/kernel/isa-bridge.c	modified	+2	−2	View file
arch/powerpc/kernel/machine_kexec.c	modified	+5	−13	View file
arch/powerpc/kernel/machine_kexec_64.c	modified	+6	−9	View file
arch/powerpc/kernel/mce.c	modified	+1	−1	View file
arch/powerpc/kernel/mce_power.c	modified	+13	−0	View file
arch/powerpc/kernel/misc_32.S	modified	+0	−6	View file
arch/powerpc/kernel/nvram_64.c	modified	+1	−11	View file
arch/powerpc/kernel/pci-hotplug.c	modified	+38	−9	View file
arch/powerpc/kernel/pci_64.c	modified	+3	−2	View file
arch/powerpc/kernel/pci_dn.c	modified	+51	−15	View file
arch/powerpc/kernel/process.c	modified	+11	−6	View file
arch/powerpc/kernel/prom.c	modified	+2	−0	View file
arch/powerpc/kernel/rtasd.c	modified	+1	−1	View file
arch/powerpc/kernel/setup-common.c	modified	+0	−6	View file
arch/powerpc/kernel/swsusp.c	modified	+1	−1	View file
arch/powerpc/kernel/time.c	modified	+1	−0	View file
arch/powerpc/kernel/vio.c	modified	+2	−2	View file
arch/powerpc/kvm/book3s_64_mmu_hv.c	modified	+5	−6	View file
arch/powerpc/kvm/book3s_hv.c	modified	+6	−0	View file
arch/powerpc/kvm/book3s_hv_rm_mmu.c	modified	+6	−6	View file
arch/powerpc/kvm/book3s_pr.c	modified	+5	−1	View file
arch/powerpc/lib/copy_32.S	modified	+1	−1	View file
arch/powerpc/lib/sstep.c	modified	+5	−0	View file
arch/powerpc/lib/xor_vmx.c	modified	+10	−0	View file
arch/powerpc/mm/Makefile	modified	+6	−4	View file
arch/powerpc/mm/fsl_booke_mmu.c	modified	+1	−1	View file
arch/powerpc/mm/hash64_4k.c	modified	+15	−14	View file
arch/powerpc/mm/hash64_64k.c	modified	+35	−36	View file
arch/powerpc/mm/hash_native_64.c	modified	+10	−1	View file
arch/powerpc/mm/hash_utils_64.c	modified	+149	−41	View file
arch/powerpc/mm/hugepage-hash64.c	modified	+11	−11	View file
arch/powerpc/mm/hugetlbpage-hash64.c	modified	+15	−14	View file
arch/powerpc/mm/hugetlbpage-radix.c	added	+87	−0	View file
arch/powerpc/mm/hugetlbpage.c	modified	+13	−7	View file
arch/powerpc/mm/init_64.c	modified	+2	−71	View file
arch/powerpc/mm/mem.c	modified	+21	−19	View file
arch/powerpc/mm/mmap.c	modified	+110	−0	View file
arch/powerpc/mm/mmu_context_hash64.c → arch/powerpc/mm/mmu_context_book3s64.c	renamed	+44	−8	View file
arch/powerpc/mm/mmu_context_nohash.c	modified	+3	−3	View file
arch/powerpc/mm/mmu_decl.h	modified	+0	−5	View file
arch/powerpc/mm/pgtable-book3e.c	added	+122	−0	View file
arch/powerpc/mm/pgtable-book3s64.c	added	+118	−0	View file
arch/powerpc/mm/pgtable-hash64.c	added	+342	−0	View file
arch/powerpc/mm/pgtable-radix.c	added	+526	−0	View file
arch/powerpc/mm/pgtable.c	modified	+19	−5	View file
arch/powerpc/mm/pgtable_64.c	modified	+69	−488	View file
arch/powerpc/mm/slb.c	modified	+0	−1	View file
arch/powerpc/mm/slb_low.S	modified	+2	−52	View file
arch/powerpc/mm/slice.c	modified	+18	−2	View file
arch/powerpc/mm/tlb-radix.c	added	+251	−0	View file
arch/powerpc/mm/tlb_hash64.c	modified	+3	−3	View file
arch/powerpc/perf/Makefile	modified	+1	−1	View file
arch/powerpc/perf/callchain.c	modified	+1	−1	View file
arch/powerpc/perf/perf_regs.c	added	+104	−0	View file
arch/powerpc/perf/power8-events-list.h	modified	+40	−0	View file
arch/powerpc/perf/power8-pmu.c	modified	+21	−20	View file
arch/powerpc/platforms/Kconfig.cputype	modified	+10	−1	View file
arch/powerpc/platforms/cell/spu_base.c	modified	+3	−6	View file
arch/powerpc/platforms/cell/spufs/fault.c	modified	+2	−2	View file
arch/powerpc/platforms/powernv/eeh-powernv.c	modified	+32	−37	View file
arch/powerpc/platforms/powernv/npu-dma.c	modified	+148	−135	View file
arch/powerpc/platforms/powernv/opal-hmi.c	modified	+5	−3	View file
arch/powerpc/platforms/powernv/pci-ioda.c	modified	+573	−380	View file
arch/powerpc/platforms/powernv/pci.c	modified	+8	−11	View file
arch/powerpc/platforms/powernv/pci.h	modified	+28	−44	View file
arch/powerpc/platforms/powernv/setup.c	modified	+4	−1	View file
arch/powerpc/platforms/ps3/htab.c	modified	+1	−1	View file
arch/powerpc/platforms/ps3/spu.c	modified	+2	−2	View file
arch/powerpc/platforms/pseries/hotplug-memory.c	modified	+181	−44	View file
arch/powerpc/platforms/pseries/iommu.c	modified	+12	−12	View file
arch/powerpc/platforms/pseries/lpar.c	modified	+12	−8	View file
arch/powerpc/platforms/pseries/lparcfg.c	modified	+2	−1	View file
arch/powerpc/platforms/pseries/mobility.c	modified	+2	−2	View file
arch/powerpc/platforms/pseries/msi.c	modified	+2	−2	View file
arch/powerpc/platforms/pseries/pci_dlpar.c	modified	+0	−32	View file
arch/powerpc/platforms/pseries/reconfig.c	modified	+1	−4	View file
arch/powerpc/platforms/pseries/setup.c	modified	+3	−1	View file
arch/powerpc/sysdev/fsl_pci.c	modified	+24	−0	View file
arch/powerpc/sysdev/mpic.c	modified	+8	−1	View file
arch/powerpc/xmon/Makefile	modified	+1	−1	View file
arch/powerpc/xmon/spr_access.S	added	+45	−0	View file
arch/powerpc/xmon/xmon.c	modified	+77	−61	View file
drivers/cpufreq/pmac32-cpufreq.c	modified	+1	−1	View file
drivers/infiniband/hw/qib/qib_file_ops.c	modified	+1	−4	View file
drivers/infiniband/hw/qib/qib_pcie.c	modified	+0	−6	View file
drivers/macintosh/rack-meter.c	modified	+3	−2	View file
drivers/macintosh/via-pmu.c	modified	+2	−2	View file
drivers/misc/cxl/api.c	modified	+19	−9	View file
drivers/misc/cxl/context.c	modified	+1	−2	View file
drivers/misc/cxl/cxl.h	modified	+5	−10	View file
drivers/misc/cxl/fault.c	modified	+6	−4	View file
drivers/misc/cxl/guest.c	modified	+51	−27	View file
drivers/misc/cxl/native.c	modified	+24	−5	View file
drivers/misc/cxl/pci.c	modified	+54	−10	View file
drivers/misc/cxl/sysfs.c	modified	+10	−0	View file
drivers/of/base.c	modified	+3	−0	View file
drivers/pci/hotplug/rpadlpar_core.c	modified	+4	−4	View file
drivers/pci/hotplug/rpaphp_core.c	modified	+2	−2	View file
drivers/pci/hotplug/rpaphp_pci.c	modified	+2	−2	View file
drivers/pcmcia/electra_cf.c	modified	+1	−1	View file
drivers/vfio/vfio_iommu_spapr_tce.c	modified	+2	−1	View file
include/misc/cxl.h	modified	+8	−0	View file
kernel/trace/ftrace.c	modified	+12	−0	View file
tools/perf/arch/powerpc/include/perf_regs.h	added	+69	−0	View file
tools/perf/arch/powerpc/util/Build	modified	+2	−0	View file
tools/perf/arch/powerpc/util/perf_regs.c	added	+49	−0	View file
tools/perf/arch/powerpc/util/unwind-libunwind.c	added	+96	−0	View file
tools/perf/config/Makefile	modified	+6	−0	View file
tools/perf/util/perf_regs.c	modified	+4	−4	View file
tools/testing/selftests/powerpc/Makefile	modified	+1	−0	View file
tools/testing/selftests/powerpc/context_switch/.gitignore	added	+1	−0	View file
tools/testing/selftests/powerpc/context_switch/Makefile	added	+10	−0	View file
tools/testing/selftests/powerpc/context_switch/cp_abort.c	added	+110	−0	View file
tools/testing/selftests/powerpc/mm/subpage_prot.c	modified	+10	−8	View file
tools/testing/selftests/powerpc/pmu/ebb/ebb.c	modified	+0	−1	View file
tools/testing/selftests/powerpc/pmu/ebb/reg_access_test.c	modified	+0	−1	View file
tools/testing/selftests/powerpc/pmu/ebb/reg.h → tools/testing/selftests/powerpc/reg.h	renamed	+12	−6	View file
tools/testing/selftests/powerpc/tm/.gitignore	modified	+3	−0	View file
tools/testing/selftests/powerpc/tm/Makefile	modified	+2	−1	View file
tools/testing/selftests/powerpc/tm/tm-fork.c	added	+42	−0	View file
tools/testing/selftests/powerpc/tm/tm-resched-dscr.c	modified	+5	−11	View file
tools/testing/selftests/powerpc/tm/tm-signal-stack.c	modified	+2	−2	View file
tools/testing/selftests/powerpc/tm/tm-tar.c	added	+90	−0	View file
tools/testing/selftests/powerpc/tm/tm-tmspr.c	added	+143	−0	View file
tools/testing/selftests/powerpc/utils.h	modified	+8	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/ABI/testing/sysfs-class-cxl

View file

diff --git a/Documentation/ABI/testing/sysfs-class-cxl b/Documentation/ABI/testing/sysfs-class-cxl
index 7fd737e..4ba0a2a 100644
--- a/Documentation/ABI/testing/sysfs-class-cxl
+++ b/Documentation/ABI/testing/sysfs-class-cxl
@@ -233,3 +233,11 @@ Description:	read/write
 		0 = don't trust, the image may be different (default)
 		1 = trust that the image will not change.
 Users:		https://github.com/ibm-capi/libcxl
+
+What:           /sys/class/cxl/<card>/psl_timebase_synced
+Date:           March 2016
+Contact:        [email protected]
+Description:    read only
+                Returns 1 if the psl timebase register is synchronized
+                with the core timebase register, 0 otherwise.
+Users:          https://github.com/ibm-capi/libcxl

Documentation/features/perf/perf-regs/arch-support.txt

View file

diff --git a/Documentation/features/perf/perf-regs/arch-support.txt b/Documentation/features/perf/perf-regs/arch-support.txt
index e2b4a78..f179b1f 100644
--- a/Documentation/features/perf/perf-regs/arch-support.txt
+++ b/Documentation/features/perf/perf-regs/arch-support.txt
@@ -27,7 +27,7 @@
     |       nios2: | TODO |
     |    openrisc: | TODO |
     |      parisc: | TODO |
-    |     powerpc: | TODO |
+    |     powerpc: |  ok  |
     |        s390: | TODO |
     |       score: | TODO |
     |          sh: | TODO |

Documentation/features/perf/perf-stackdump/arch-support.txt

View file

diff --git a/Documentation/features/perf/perf-stackdump/arch-support.txt b/Documentation/features/perf/perf-stackdump/arch-support.txt
index 3dc24b0..85777c5 100644
--- a/Documentation/features/perf/perf-stackdump/arch-support.txt
+++ b/Documentation/features/perf/perf-stackdump/arch-support.txt
@@ -27,7 +27,7 @@
     |       nios2: | TODO |
     |    openrisc: | TODO |
     |      parisc: | TODO |
-    |     powerpc: | TODO |
+    |     powerpc: |  ok  |
     |        s390: | TODO |
     |       score: | TODO |
     |          sh: | TODO |

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

View file

diff --git a/Documentation/powerpc/eeh-pci-error-recovery.txt b/Documentation/powerpc/eeh-pci-error-recovery.txt
index 9d4e33d..6781892 100644
--- a/Documentation/powerpc/eeh-pci-error-recovery.txt
+++ b/Documentation/powerpc/eeh-pci-error-recovery.txt
@@ -12,7 +12,7 @@ Overview:
 The IBM POWER-based pSeries and iSeries computers include PCI bus
 controller chips that have extended capabilities for detecting and
 reporting a large variety of PCI bus error conditions.  These features
-go under the name of "EEH", for "Extended Error Handling".  The EEH
+go under the name of "EEH", for "Enhanced Error Handling".  The EEH
 hardware features allow PCI bus errors to be cleared and a PCI
 card to be "rebooted", without also having to reboot the operating
 system.

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 65f3277..2c670ba 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6675,6 +6675,19 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
 S:	Supported
 F:	Documentation/powerpc/
 F:	arch/powerpc/
+F:	drivers/char/tpm/tpm_ibmvtpm*
+F:	drivers/crypto/nx/
+F:	drivers/crypto/vmx/
+F:	drivers/net/ethernet/ibm/ibmveth.*
+F:	drivers/net/ethernet/ibm/ibmvnic.*
+F:	drivers/pci/hotplug/rpa*
+F:	drivers/scsi/ibmvscsi/
+N:	opal
+N:	/pmac
+N:	powermac
+N:	powernv
+N:	[^a-z0-9]ps3
+N:	pseries
 
 LINUX FOR POWER MACINTOSH
 M:	Benjamin Herrenschmidt <[email protected]>

arch/powerpc/Kconfig

View file

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index a18a0dc..f0403b5 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -116,6 +116,8 @@ config PPC
 	select GENERIC_ATOMIC64 if PPC32
 	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 	select HAVE_PERF_EVENTS
+	select HAVE_PERF_REGS
+	select HAVE_PERF_USER_STACK_DUMP
 	select HAVE_REGS_AND_STACK_ACCESS_API
 	select HAVE_HW_BREAKPOINT if PERF_EVENTS && PPC_BOOK3S_64
 	select ARCH_WANT_IPC_PARSE_VERSION
@@ -606,9 +608,9 @@ endchoice
 
 config FORCE_MAX_ZONEORDER
 	int "Maximum zone order"
-	range 9 64 if PPC64 && PPC_64K_PAGES
+	range 8 9 if PPC64 && PPC_64K_PAGES
 	default "9" if PPC64 && PPC_64K_PAGES
-	range 13 64 if PPC64 && !PPC_64K_PAGES
+	range 9 13 if PPC64 && !PPC_64K_PAGES
 	default "13" if PPC64 && !PPC_64K_PAGES
 	range 9 64 if PPC32 && PPC_16K_PAGES
 	default "9" if PPC32 && PPC_16K_PAGES
@@ -795,7 +797,6 @@ config 4xx_SOC
 
 config FSL_LBC
 	bool "Freescale Local Bus support"
-	depends on FSL_SOC
 	help
 	  Enables reporting of errors from the Freescale local bus
 	  controller.  Also contains some common code used by

arch/powerpc/Kconfig.debug

View file

diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 638f9ce..d3fcf7e 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -19,14 +19,6 @@ config PPC_WERROR
 	depends on !PPC_DISABLE_WERROR
 	default y
 
-config STRICT_MM_TYPECHECKS
-	bool "Do extra type checking on mm types"
-	default n
-	help
-	  This option turns on extra type checking for some mm related types.
-
-	  If you don't know what this means, say N.
-
 config PRINT_STACK_DEPTH
 	int "Stack depth to print" if DEBUG_KERNEL
 	default 64

arch/powerpc/boot/Makefile

View file

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 6116510..8fe78a3 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -362,9 +362,6 @@ $(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
 $(obj)/cuImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
 	$(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb)
 
-$(obj)/cuImage.%: vmlinux $(obj)/fsl/%.dtb $(wrapperbits)
-	$(call if_changed,wrap,cuboot-$*,,$(obj)/fsl/$*.dtb)
-
 $(obj)/simpleImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
 	$(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
 
@@ -381,6 +378,9 @@ $(obj)/treeImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
 $(obj)/%.dtb: $(src)/dts/%.dts FORCE
 	$(call if_changed_dep,dtc)
 
+$(obj)/%.dtb: $(src)/dts/fsl/%.dts FORCE
+	$(call if_changed_dep,dtc)
+
 # If there isn't a platform selected then just strip the vmlinux.
 ifeq (,$(image-y))
 image-y := vmlinux.strip

arch/powerpc/boot/dts/fsl/gef_ppc9a.dts

View file

diff --git a/arch/powerpc/boot/dts/fsl/gef_ppc9a.dts b/arch/powerpc/boot/dts/fsl/gef_ppc9a.dts
index 0424fc2..c88d4ef 100644
--- a/arch/powerpc/boot/dts/fsl/gef_ppc9a.dts
+++ b/arch/powerpc/boot/dts/fsl/gef_ppc9a.dts
@@ -211,6 +211,10 @@
 				  0x0 0x00400000>;
 		};
 	};
+
+	pci1: pcie@fef09000 {
+		status = "disabled";
+	};
 };
 
 /include/ "mpc8641si-post.dtsi"

arch/powerpc/boot/dts/fsl/gef_sbc310.dts

View file

diff --git a/arch/powerpc/boot/dts/fsl/gef_sbc310.dts b/arch/powerpc/boot/dts/fsl/gef_sbc310.dts
index 84b3d38..8385157 100644
--- a/arch/powerpc/boot/dts/fsl/gef_sbc310.dts
+++ b/arch/powerpc/boot/dts/fsl/gef_sbc310.dts
@@ -24,10 +24,6 @@
 	model = "GEF_SBC310";
 	compatible = "gef,sbc310";
 
-	aliases {
-		pci1 = &pci1;
-	};
-
 	memory {
 		device_type = "memory";
 		reg = <0x0 0x40000000>;	// set by uboot
@@ -223,29 +219,11 @@
 	};
 
 	pci1: pcie@fef09000 {
-		compatible = "fsl,mpc8641-pcie";
-		device_type = "pci";
-		#size-cells = <2>;
-		#address-cells = <3>;
 		reg = <0xfef09000 0x1000>;
-		bus-range = <0x0 0xff>;
 		ranges = <0x02000000 0x0 0xc0000000 0xc0000000 0x0 0x20000000
 			  0x01000000 0x0 0x00000000 0xfe400000 0x0 0x00400000>;
-		clock-frequency = <100000000>;
-		interrupts = <0x19 0x2 0 0>;
-		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-		interrupt-map = <
-			0x0000 0x0 0x0 0x1 &mpic 0x4 0x2
-			0x0000 0x0 0x0 0x2 &mpic 0x5 0x2
-			0x0000 0x0 0x0 0x3 &mpic 0x6 0x2
-			0x0000 0x0 0x0 0x4 &mpic 0x7 0x2
-			>;
 
 		pcie@0 {
-			reg = <0 0 0 0 0>;
-			#size-cells = <2>;
-			#address-cells = <3>;
-			device_type = "pci";
 			ranges = <0x02000000 0x0 0xc0000000
 				  0x02000000 0x0 0xc0000000
 				  0x0 0x20000000

arch/powerpc/boot/dts/fsl/gef_sbc610.dts

View file

diff --git a/arch/powerpc/boot/dts/fsl/gef_sbc610.dts b/arch/powerpc/boot/dts/fsl/gef_sbc610.dts
index 974446a..ff423ab 100644
--- a/arch/powerpc/boot/dts/fsl/gef_sbc610.dts
+++ b/arch/powerpc/boot/dts/fsl/gef_sbc610.dts
@@ -209,6 +209,10 @@
 				  0x0 0x00400000>;
 		};
 	};
+
+	pci1: pcie@fef09000 {
+		status = "disabled";
+	};
 };
 
 /include/ "mpc8641si-post.dtsi"

arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts

View file

diff --git a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts
index 554001f..11bea3e 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts
@@ -15,10 +15,6 @@
 	model = "MPC8641HPCN";
 	compatible = "fsl,mpc8641hpcn";
 
-	aliases {
-		pci1 = &pci1;
-	};
-
 	memory {
 		device_type = "memory";
 		reg = <0x00000000 0x40000000>;	// 1G at 0x0
@@ -359,29 +355,11 @@
 	};
 
 	pci1: pcie@ffe09000 {
-		compatible = "fsl,mpc8641-pcie";
-		device_type = "pci";
-		#size-cells = <2>;
-		#address-cells = <3>;
 		reg = <0xffe09000 0x1000>;
-		bus-range = <0 0xff>;
 		ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
 			  0x01000000 0x0 0x00000000 0xffc10000 0x0 0x00010000>;
-		clock-frequency = <100000000>;
-		interrupts = <25 2 0 0>;
-		interrupt-map-mask = <0xf800 0 0 7>;
-		interrupt-map = <
-			/* IDSEL 0x0 */
-			0x0000 0 0 1 &mpic 4 1
-			0x0000 0 0 2 &mpic 5 1
-			0x0000 0 0 3 &mpic 6 1
-			0x0000 0 0 4 &mpic 7 1
-			>;
+
 		pcie@0 {
-			reg = <0 0 0 0 0>;
-			#size-cells = <2>;
-			#address-cells = <3>;
-			device_type = "pci";
 			ranges = <0x02000000 0x0 0xa0000000
 				  0x02000000 0x0 0xa0000000
 				  0x0 0x20000000

arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts

View file

diff --git a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts
index fec5867..7ff6204 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts
@@ -17,10 +17,6 @@
 	#address-cells = <2>;
 	#size-cells = <2>;
 
-	aliases {
-		pci1 = &pci1;
-	};
-
 	memory {
 		device_type = "memory";
 		reg = <0x0 0x00000000 0x0 0x40000000>;	// 1G at 0x0
@@ -326,29 +322,11 @@
 	};
 
 	pci1: pcie@fffe09000 {
-		compatible = "fsl,mpc8641-pcie";
-		device_type = "pci";
-		#size-cells = <2>;
-		#address-cells = <3>;
 		reg = <0x0f 0xffe09000 0x0 0x1000>;
-		bus-range = <0x0 0xff>;
 		ranges = <0x02000000 0x0 0xe0000000 0x0c 0x20000000 0x0 0x20000000
 			  0x01000000 0x0 0x00000000 0x0f 0xffc10000 0x0 0x00010000>;
-		clock-frequency = <100000000>;
-		interrupts = <25 2 0 0>;
-		interrupt-map-mask = <0xf800 0 0 7>;
-		interrupt-map = <
-			/* IDSEL 0x0 */
-			0x0000 0 0 1 &mpic 4 1
-			0x0000 0 0 2 &mpic 5 1
-			0x0000 0 0 3 &mpic 6 1
-			0x0000 0 0 4 &mpic 7 1
-			>;
+
 		pcie@0 {
-			reg = <0 0 0 0 0>;
-			#size-cells = <2>;
-			#address-cells = <3>;
-			device_type = "pci";
 			ranges = <0x02000000 0x0 0xe0000000
 				  0x02000000 0x0 0xe0000000
 				  0x0 0x20000000

arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi b/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi
index 70889d8..eeb7c65 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi
@@ -102,19 +102,46 @@
 	bus-range = <0x0 0xff>;
 	clock-frequency = <100000000>;
 	interrupts = <24 2 0 0>;
-	interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
 
-	interrupt-map = <
-		0x0000 0x0 0x0 0x1 &mpic 0x0 0x1
-		0x0000 0x0 0x0 0x2 &mpic 0x1 0x1
-		0x0000 0x0 0x0 0x3 &mpic 0x2 0x1
-		0x0000 0x0 0x0 0x4 &mpic 0x3 0x1
-		>;
+	pcie@0 {
+		reg = <0 0 0 0 0>;
+		#interrupt-cells = <1>;
+		#size-cells = <2>;
+		#address-cells = <3>;
+		device_type = "pci";
+		interrupts = <24 2 0 0>;
+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+		interrupt-map = <
+			0x0000 0x0 0x0 0x1 &mpic 0x0 0x1 0x0 0x0
+			0x0000 0x0 0x0 0x2 &mpic 0x1 0x1 0x0 0x0
+			0x0000 0x0 0x0 0x3 &mpic 0x2 0x1 0x0 0x0
+			0x0000 0x0 0x0 0x4 &mpic 0x3 0x1 0x0 0x0
+			>;
+	};
+};
+
+&pci1 {
+	compatible = "fsl,mpc8641-pcie";
+	device_type = "pci";
+	#size-cells = <2>;
+	#address-cells = <3>;
+	bus-range = <0x0 0xff>;
+	clock-frequency = <100000000>;
+	interrupts = <25 2 0 0>;
 
 	pcie@0 {
 		reg = <0 0 0 0 0>;
+		#interrupt-cells = <1>;
 		#size-cells = <2>;
 		#address-cells = <3>;
 		device_type = "pci";
+		interrupts = <25 2 0 0>;
+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+		interrupt-map = <
+			0x0000 0x0 0x0 0x1 &mpic 0x4 0x1 0x0 0x0
+			0x0000 0x0 0x0 0x2 &mpic 0x5 0x1 0x0 0x0
+			0x0000 0x0 0x0 0x3 &mpic 0x6 0x1 0x0 0x0
+			0x0000 0x0 0x0 0x4 &mpic 0x7 0x1 0x0 0x0
+			>;
 	};
 };

arch/powerpc/boot/dts/fsl/mpc8641si-pre.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/mpc8641si-pre.dtsi b/arch/powerpc/boot/dts/fsl/mpc8641si-pre.dtsi
index 9e03328..7c6db6f 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8641si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/mpc8641si-pre.dtsi
@@ -25,6 +25,7 @@
 		serial0 = &serial0;
 		serial1 = &serial1;
 		pci0 = &pci0;
+		pci1 = &pci1;
 	};
 
 	cpus {

arch/powerpc/boot/dts/fsl/sbc8641d.dts

View file

diff --git a/arch/powerpc/boot/dts/fsl/sbc8641d.dts b/arch/powerpc/boot/dts/fsl/sbc8641d.dts
index 0a9733c..75870a1 100644
--- a/arch/powerpc/boot/dts/fsl/sbc8641d.dts
+++ b/arch/powerpc/boot/dts/fsl/sbc8641d.dts
@@ -19,10 +19,6 @@
 	model = "SBC8641D";
 	compatible = "wind,sbc8641";
 
-	aliases {
-		pci1 = &pci1;
-	};
-
 	memory {
 		device_type = "memory";
 		reg = <0x00000000 0x20000000>;	// 512M at 0x0
@@ -165,30 +161,11 @@
 	};
 
 	pci1: pcie@f8009000 {
-		compatible = "fsl,mpc8641-pcie";
-		device_type = "pci";
-		#size-cells = <2>;
-		#address-cells = <3>;
 		reg = <0xf8009000 0x1000>;
-		bus-range = <0 0xff>;
 		ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
 			  0x01000000 0x0 0x00000000 0xe3000000 0x0 0x00100000>;
-		clock-frequency = <100000000>;
-		interrupts = <25 2 0 0>;
-		interrupt-map-mask = <0xf800 0 0 7>;
-		interrupt-map = <
-			/* IDSEL 0x0 */
-			0x0000 0 0 1 &mpic 4 1
-			0x0000 0 0 2 &mpic 5 1
-			0x0000 0 0 3 &mpic 6 1
-			0x0000 0 0 4 &mpic 7 1
-			>;
 
 		pcie@0 {
-			reg = <0 0 0 0 0>;
-			#size-cells = <2>;
-			#address-cells = <3>;
-			device_type = "pci";
 			ranges = <0x02000000 0x0 0xa0000000
 				  0x02000000 0x0 0xa0000000
 				  0x0 0x20000000

arch/powerpc/boot/dts/fsl/t1023si-post.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi b/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi
index 99e421d..6e0b489 100644
--- a/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi
@@ -263,7 +263,7 @@
 	};
 
 	rcpm: global-utilities@e2000 {
-		compatible = "fsl,t1023-rcpm", "fsl,qoriq-rcpm-2.0";
+		compatible = "fsl,t1023-rcpm", "fsl,qoriq-rcpm-2.1";
 		reg = <0xe2000 0x1000>;
 	};
 

arch/powerpc/boot/dts/fsl/t1040si-post.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi b/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
index e0f4da5..507649e 100644
--- a/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
@@ -472,7 +472,7 @@
 	};
 
 	rcpm: global-utilities@e2000 {
-		compatible = "fsl,t1040-rcpm", "fsl,qoriq-rcpm-2.0";
+		compatible = "fsl,t1040-rcpm", "fsl,qoriq-rcpm-2.1";
 		reg = <0xe2000 0x1000>;
 	};
 

arch/powerpc/boot/dts/fsl/t104xrdb.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/t104xrdb.dtsi b/arch/powerpc/boot/dts/fsl/t104xrdb.dtsi
index 72691ef..7c4afdb 100644
--- a/arch/powerpc/boot/dts/fsl/t104xrdb.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t104xrdb.dtsi
@@ -109,7 +109,7 @@
 			flash@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "micron,n25q512a", "jedec,spi-nor";
+				compatible = "micron,n25q512ax3", "jedec,spi-nor";
 				reg = <0>;
 				spi-max-frequency = <10000000>; /* input clock */
 			};

arch/powerpc/boot/dts/fsl/t208xrdb.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/t208xrdb.dtsi b/arch/powerpc/boot/dts/fsl/t208xrdb.dtsi
index dc93268..ff87e67 100644
--- a/arch/powerpc/boot/dts/fsl/t208xrdb.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t208xrdb.dtsi
@@ -113,7 +113,7 @@
 			flash@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "micron,n25q512a", "jedec,spi-nor";
+				compatible = "micron,n25q512ax3", "jedec,spi-nor";
 				reg = <0>;
 				spi-max-frequency = <10000000>; /* input clock */
 			};

arch/powerpc/include/asm/book3s/32/hash.h

View file

diff --git a/arch/powerpc/include/asm/book3s/32/hash.h b/arch/powerpc/include/asm/book3s/32/hash.h
index 264b754..880db13 100644
--- a/arch/powerpc/include/asm/book3s/32/hash.h
+++ b/arch/powerpc/include/asm/book3s/32/hash.h
@@ -39,8 +39,5 @@
 #define _PMD_PRESENT_MASK (PAGE_MASK)
 #define _PMD_BAD	(~PAGE_MASK)
 
-/* Hash table based platforms need atomic updates of the linux PTE */
-#define PTE_ATOMIC_UPDATES	1
-
 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_BOOK3S_32_HASH_H */

arch/powerpc/include/asm/book3s/32/mmu-hash.h

View file

diff --git a/arch/powerpc/include/asm/book3s/32/mmu-hash.h b/arch/powerpc/include/asm/book3s/32/mmu-hash.h
index 16f513e..b82e063 100644
--- a/arch/powerpc/include/asm/book3s/32/mmu-hash.h
+++ b/arch/powerpc/include/asm/book3s/32/mmu-hash.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_POWERPC_MMU_HASH32_H_
-#define _ASM_POWERPC_MMU_HASH32_H_
+#ifndef _ASM_POWERPC_BOOK3S_32_MMU_HASH_H_
+#define _ASM_POWERPC_BOOK3S_32_MMU_HASH_H_
 /*
  * 32-bit hash table MMU support
  */
@@ -90,4 +90,4 @@ typedef struct {
 #define mmu_virtual_psize	MMU_PAGE_4K
 #define mmu_linear_psize	MMU_PAGE_256M
 
-#endif /* _ASM_POWERPC_MMU_HASH32_H_ */
+#endif /* _ASM_POWERPC_BOOK3S_32_MMU_HASH_H_ */

arch/powerpc/include/asm/book3s/32/pgalloc.h

View file

diff --git a/arch/powerpc/include/asm/book3s/32/pgalloc.h b/arch/powerpc/include/asm/book3s/32/pgalloc.h
new file mode 100644
index 0000000..a235019
--- /dev/null
+++ b/arch/powerpc/include/asm/book3s/32/pgalloc.h
@@ -0,0 +1,109 @@
+#ifndef _ASM_POWERPC_BOOK3S_32_PGALLOC_H
+#define _ASM_POWERPC_BOOK3S_32_PGALLOC_H
+
+#include <linux/threads.h>
+
+/* For 32-bit, all levels of page tables are just drawn from get_free_page() */
+#define MAX_PGTABLE_INDEX_SIZE	0
+
+extern void __bad_pte(pmd_t *pmd);
+
+extern pgd_t *pgd_alloc(struct mm_struct *mm);
+extern void pgd_free(struct mm_struct *mm, pgd_t *pgd);
+
+/*
+ * We don't have any real pmd's, and this code never triggers because
+ * the pgd will always be present..
+ */
+/* #define pmd_alloc_one(mm,address)       ({ BUG(); ((pmd_t *)2); }) */
+#define pmd_free(mm, x) 		do { } while (0)
+#define __pmd_free_tlb(tlb,x,a)		do { } while (0)
+/* #define pgd_populate(mm, pmd, pte)      BUG() */
+
+#ifndef CONFIG_BOOKE
+
+static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp,
+				       pte_t *pte)
+{
+	*pmdp = __pmd(__pa(pte) | _PMD_PRESENT);
+}
+
+static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmdp,
+				pgtable_t pte_page)
+{
+	*pmdp = __pmd((page_to_pfn(pte_page) << PAGE_SHIFT) | _PMD_PRESENT);
+}
+
+#define pmd_pgtable(pmd) pmd_page(pmd)
+#else
+
+static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp,
+				       pte_t *pte)
+{
+	*pmdp = __pmd((unsigned long)pte | _PMD_PRESENT);
+}
+
+static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmdp,
+				pgtable_t pte_page)
+{
+	*pmdp = __pmd((unsigned long)lowmem_page_address(pte_page) | _PMD_PRESENT);
+}
+
+#define pmd_pgtable(pmd) pmd_page(pmd)
+#endif
+
+extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr);
+extern pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long addr);
+
+static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
+{
+	free_page((unsigned long)pte);
+}
+
+static inline void pte_free(struct mm_struct *mm, pgtable_t ptepage)
+{
+	pgtable_page_dtor(ptepage);
+	__free_page(ptepage);
+}
+
+static inline void pgtable_free(void *table, unsigned index_size)
+{
+	BUG_ON(index_size); /* 32-bit doesn't use this */
+	free_page((unsigned long)table);
+}