Linus Torvalds 4ae4614712 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ... Pull powerpc fixes from Benjamin Herrenschmidt: "I meant to sent that earlier but got swamped with other things, so here are some powerpc fixes for 3.6. A few regression fixes and some bug fixes that I deemed should still make it. There's a FSL update from Kumar with a bunch of defconfig updates along with a few embedded fixes. I also reverted my g5_defconfig update that I merged earlier as it was completely busted, not too sure what happened there, I'll do a new one later." * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: Revert "powerpc: Update g5_defconfig" powerpc/perf: Use pmc_overflow() to detect rolled back events powerpc: Fix VMX in interrupt check in POWER7 copy loops powerpc: POWER7 copy_to_user/copy_from_user patch applied twice powerpc: Fix personality handling in ppc64_personality() powerpc/dma-iommu: Fix IOMMU window check powerpc: Remove unnecessary ifdefs powerpc/kgdb: Restore current_thread_info properly powerpc/kgdb: Bail out of KGDB when we've been triggered powerpc/kgdb: Do not set kgdb_single_step on ppc powerpc/mpic_msgr: Add missing includes powerpc: Fix null pointer deref in perf hardware breakpoints powerpc: Fixup whitespace in xmon powerpc: Fix xmon dl command for new printk implementation powerpc/fsl: fix "Failed to mount /dev: No such device" errors powerpc/fsl: update defconfigs booke/wdt: some ioctls do not return values properly powerpc/p4080ds: dts - add usb controller version info and port0 powerpc/85xx: mpc85xx_defconfig - add VIA PATA support for MPC85xxCDS powerpc/fsl-pci: Only scan PCI bus if configured as a host		2012-08-25 17:30:18 -07:00
..
8xx_immap.h
abs_addr.h	powerpc: Remove FW_FEATURE ISERIES from arch code	2012-03-21 11:16:11 +11:00
agp.h
asm-compat.h	powerpc: Change mtcrf to use real register names	2012-07-10 19:18:11 +10:00
asm-offsets.h
async_tx.h
atomic.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
auxvec.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
backlight.h
barrier.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
bitops.h
bitsperlong.h
bootx.h
btext.h
bug.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
bugs.h
byteorder.h
cache.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
cacheflush.h
cell-pmu.h
cell-regs.h
checksum.h
clk_interface.h
cmpxchg.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
code-patching.h	powerpc: Have patch_instruction detect faults	2012-07-03 14:14:38 +10:00
compat.h
cpm.h
cpm1.h
cpm2.h
cputable.h	powerpc: Remove unnecessary ifdefs	2012-08-24 20:26:06 +10:00
cputhreads.h	powerpc: Fixing a cputhread code documentation	2012-05-22 14:37:00 +10:00
cputime.h	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2012-01-06 17:58:22 -08:00
current.h
dbdma.h
dbell.h	KVM: PPC: e500mc: Add doorbell emulation support	2012-04-08 12:54:50 +03:00
dcr-generic.h
dcr-mmio.h
dcr-native.h
dcr-regs.h
dcr.h
debug.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
delay.h
device.h	powerpc: IOMMU fault injection	2012-07-10 19:18:59 +10:00
disassemble.h
div64.h
dma-mapping.h	common: dma-mapping: add support for generic dma_mmap_* calls	2012-07-30 12:25:46 +02:00
dma.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
edac.h
eeh.h	powerpc/eeh: pseries platform config space access in EEH	2012-03-09 11:39:51 +11:00
eeh_event.h	powerpc/eeh: Replace pci_dn with eeh_dev for EEH aux components	2012-03-09 11:39:46 +11:00
ehv_pic.h	irq_domain/powerpc: Use common irq_domain structure instead of irq_host	2012-02-14 14:06:50 -07:00
elf.h
emergency-restart.h
emulated_ops.h
epapr_hcalls.h	KVM: PPC: Factor out guest epapr initialization	2012-05-30 11:43:10 +02:00
errno.h
exception-64e.h
exception-64s.h	powerpc: Use CURRENT_THREAD_INFO instead of open coded assembly	2012-07-11 14:18:22 +10:00
exec.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
fadump.h	fadump: Invalidate registration and release reserved memory for general use.	2012-02-23 10:50:02 +11:00
fb.h
fcntl.h
feature-fixups.h
firmware.h	powerpc: Remove FW_FEATURE ISERIES from arch code	2012-03-21 11:16:11 +11:00
fixmap.h
floppy.h
fs_pd.h
fsl_85xx_cache_sram.h
fsl_gtm.h
fsl_guts.h	powerpc/8xxx: remove 85xx/86xx restrictions from fsl_guts.h	2012-03-29 08:14:07 -05:00
fsl_hcalls.h
fsl_ifc.h	powerpc/fsl: Add support for Integrated Flash Controller	2012-01-04 15:41:22 -06:00
fsl_lbc.h
ftrace.h
futex.h
gpio.h	gpiolib/arches: Centralise bolierplate asm/gpio.h	2012-05-11 18:00:14 -06:00
grackle.h
hardirq.h
heathrow.h
highmem.h	highmem: kill all __kmap_atomic()	2012-03-20 21:48:30 +08:00
hugetlb.h
hvcall.h	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-05-24 16:17:30 -07:00
hvconsole.h
hvcserver.h
hvsi.h
hw_breakpoint.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
hw_irq.h	KVM updates for the 3.6 merge window	2012-07-24 12:01:20 -07:00
hydra.h
i8259.h	irq_domain/powerpc: Use common irq_domain structure instead of irq_host	2012-02-14 14:06:50 -07:00
ibmebus.h
ide.h
immap_cpm2.h
immap_qe.h	powerpc/qe: set IReady in QE Microcode Upload	2012-07-10 07:08:58 -05:00
io-defs.h
io-workarounds.h
io.h	powerpc: Disable /dev/port interface on systems without an ISA bridge	2012-07-11 18:22:32 +10:00
io_event_irq.h
ioctl.h
ioctls.h
iommu.h	powerpc/iommu: Implement IOMMU pools to improve multiqueue adapter performance	2012-07-03 14:14:48 +10:00
ipcbuf.h
ipic.h
irq.h	powerpc/irqdomain: Fix broken NR_IRQ references	2012-04-30 10:45:26 +10:00
irq_regs.h
irqflags.h	powerpc: Rework lazy-interrupt handling	2012-03-09 13:25:06 +11:00
jump_label.h	static keys: Introduce 'struct static_key', static_key_true()/false() and static_key_slow_[inc|dec]()	2012-02-24 10:05:59 +01:00
Kbuild
kdebug.h
kdump.h
kexec.h
keylargo.h	Typos: change aditional to additional.	2012-02-21 11:40:36 +01:00
kgdb.h
kmap_types.h	powerpc: remove km_type definitions	2012-07-24 15:27:29 +08:00
kprobes.h
kvm.h	KVM: PPC: e500mc support	2012-04-08 12:54:33 +03:00
kvm_44x.h
kvm_asm.h	KVM: PPC: Restrict PPC_[L|ST]D macro to asm code	2012-05-06 16:19:08 +02:00
kvm_book3s.h	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-05-24 16:17:30 -07:00
kvm_book3s_32.h	KVM: PPC: Use get/set for to_svcpu to help preemption	2012-03-05 14:52:30 +02:00
kvm_book3s_64.h	KVM: PPC: Book3S HV: Make the guest hash table size configurable	2012-05-30 11:43:10 +02:00
kvm_book3s_asm.h	powerpc: Add VDSO version of getcpu	2012-07-11 14:18:40 +10:00
kvm_booke.h	KVM: PPC: factor out lpid allocator from book3s_64_mmu_hv	2012-04-08 12:51:02 +03:00
kvm_booke_hv_asm.h	KVM: PPC: booke: category E.HV (GS-mode) support	2012-04-08 12:51:19 +03:00
kvm_fpu.h
kvm_host.h	KVM: PPC: Add cache flush on page map	2012-08-16 14:14:53 +02:00
kvm_para.h	kvmclock: Add functions to check if the host has stopped the vm	2012-04-08 12:48:59 +03:00
kvm_ppc.h	KVM: PPC: Add cache flush on page map	2012-08-16 14:14:53 +02:00
libata-portmap.h
linkage.h
local.h
local64.h
lppaca.h	powerpc: Reformat lppaca.h	2012-04-30 15:37:16 +10:00
lv1call.h	powerpc/ps3: Correct lv1 repository routine names	2012-04-24 15:34:16 -07:00
machdep.h	powerpc: Remove NO_IRQ_IGNORE	2012-03-28 11:32:01 +11:00
macio.h
mc146818rtc.h
mediabay.h
mman.h
mmu-8xx.h
mmu-40x.h
mmu-44x.h
mmu-book3e.h	KVM: PPC: booke: category E.HV (GS-mode) support	2012-04-08 12:51:19 +03:00
mmu-hash32.h
mmu-hash64.h	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2012-03-28 14:41:36 -07:00
mmu.h	powerpc/mm: remove obsolete comment about page size name array	2012-07-03 14:14:50 +10:00
mmu_context.h
mmzone.h
module.h
mpc5xxx.h
mpc6xx.h
mpc8xx.h
mpc52xx.h
mpc52xx_psc.h
mpc5121.h
mpc8260.h
mpic.h	powerpc/mpic: Properly set default triggers	2012-04-23 11:04:30 +10:00
mpic_msgr.h	powerpc/mpic_msgr: Add missing includes	2012-08-24 20:26:04 +10:00
msgbuf.h
msi_bitmap.h
mutex.h
nvram.h
ohare.h
opal.h
oprofile_impl.h
paca.h	powerpc: Rework lazy-interrupt handling	2012-03-09 13:25:06 +11:00
page.h
page_32.h
page_64.h
param.h
parport.h
pasemi_dma.h
pci-bridge.h	powerpc/PCI: register busn_res for root buses	2012-06-13 15:42:24 -06:00
pci.h	powerpc/PCI: compute I/O space bus-to-resource offset consistently	2012-03-20 10:41:44 -07:00
percpu.h
perf_event.h	powerpc/perf: Move code to select SIAR or pt_regs into perf_read_regs	2012-07-10 19:18:41 +10:00
perf_event_fsl_emb.h
perf_event_server.h	powerpc/perf: Fix instruction address sampling on 970 and Power4	2012-03-28 11:33:24 +11:00
pgalloc-32.h
pgalloc-64.h
pgalloc.h
pgtable-ppc32.h
pgtable-ppc64-4k.h
pgtable-ppc64-64k.h
pgtable-ppc64.h
pgtable.h
pmac_feature.h
pmac_low_i2c.h
pmac_pfunc.h
pmc.h
pmi.h
poll.h
posix_types.h	bury __kernel_nlink_t, make internal nlink_t consistent	2012-05-30 21:04:50 -04:00
ppc-opcode.h	powerpc: Enforce usage of RA 0-R31 where possible	2012-07-10 19:18:35 +10:00
ppc-pci.h	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-03-23 14:02:12 -07:00
ppc4xx.h
ppc_asm.h	powerpc: Enforce usage of R0-R31 where possible	2012-07-10 19:18:30 +10:00
processor.h	powerpc/pseries/cpuidle: Replace pseries_notify_cpuidle_add call with notifier	2012-07-03 14:14:40 +10:00
prom.h
ps3.h
ps3av.h
ps3fb.h
ps3gpu.h
ps3stor.h
pSeries_reconfig.h	powerpc/pseries: Add pseries update notifier for OFDT prop changes	2012-05-14 10:49:06 +10:00
pte-8xx.h
pte-40x.h
pte-44x.h
pte-book3e.h
pte-common.h
pte-fsl-booke.h
pte-hash32.h
pte-hash64-4k.h
pte-hash64-64k.h
pte-hash64.h
ptrace.h	powerpc: Remove old powerpc specific ptrace getregs/setregs calls	2012-04-30 15:37:28 +10:00
qe.h	powerpc/qe: set IReady in QE Microcode Upload	2012-07-10 07:08:58 -05:00
qe_ic.h
reg.h	powerpc: Add "memory" attribute for mfmsr()	2012-07-11 15:25:45 +10:00
reg_8xx.h
reg_a2.h
reg_booke.h	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-05-24 16:17:30 -07:00
reg_fsl_emb.h
resource.h
rheap.h
rio.h
rtas.h	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
rtc.h
runlatch.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
scatterlist.h
scom.h
seccomp.h
sections.h
sembuf.h
serial.h
setjmp.h
setup.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
sfp-machine.h
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
smp.h	powerpc: Random little legacy iSeries removal tidy ups	2012-03-28 11:33:23 +11:00
smu.h
socket.h	net: Add framework to allow sending packets with customized CRC.	2012-02-24 01:37:35 -08:00
sockios.h
sparsemem.h
spinlock.h	powerpc: Remove the remaining CONFIG_PPC_ISERIES pieces	2012-03-21 11:16:12 +11:00
spinlock_types.h
spu.h	Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-01-08 12:19:57 -08:00
spu_csa.h
spu_info.h
spu_priv1.h
sstep.h
stat.h	powerpc: Fix size of st_nlink on 64bit	2012-06-02 10:44:11 -04:00
statfs.h
string.h
swab.h
swiotlb.h
switch_to.h	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-05-24 16:17:30 -07:00
synch.h
syscall.h
syscalls.h
systbl.h
tce.h
termbits.h
termios.h
thread_info.h	powerpc: Use CURRENT_THREAD_INFO instead of open coded assembly	2012-07-11 14:18:22 +10:00
time.h	KVM: PPC: Use clockevent multiplier and shifter for decrementer	2012-05-06 16:19:07 +02:00
timex.h
tlb.h
tlbflush.h
topology.h	sched/numa: Rewrite the CONFIG_NUMA sched domain support	2012-05-09 15:00:55 +02:00
trace.h	powerpc: tracing: Avoid tracepoint duplication with DECLARE_EVENT_CLASS	2012-07-03 14:14:41 +10:00
tsi108.h
tsi108_irq.h
tsi108_pci.h
types.h	Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-01-08 12:19:57 -08:00
uaccess.h	powerpc: Use the new generic strncpy_from_user() and strnlen_user()	2012-05-27 21:00:07 -07:00
ucc.h
ucc_fast.h
ucc_slow.h
ucontext.h
udbg.h	powerpc: Random little legacy iSeries removal tidy ups	2012-03-28 11:33:23 +11:00
uic.h
unaligned.h
uninorth.h
unistd.h	ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION	2012-07-30 17:25:21 -07:00
user.h
vdso.h	powerpc: Add VDSO version of getcpu	2012-07-11 14:18:40 +10:00
vdso_datapage.h
vga.h
vio.h	powerpc: Call dma_debug_add_bus for PCI and VIO buses	2012-07-10 19:18:57 +10:00
word-at-a-time.h	powerpc: Use the new generic strncpy_from_user() and strnlen_user()	2012-05-27 21:00:07 -07:00
wsp.h
xics.h	irq_domain/powerpc: Use common irq_domain structure instead of irq_host	2012-02-14 14:06:50 -07:00
xilinx_intc.h
xilinx_pci.h
xmon.h
xor.h