summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2008-07-14powerpc/stacktrace: EXPORT SYMBOL_GPL needs module.hStephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2008-07-14s390: fix compile error due to smp_call_functionChristian Borntraeger
the following patch in linux-next (v2.6.26-rc9-7220-g5e36ed1) commit 8691e5a8f691cc2a4fda0651e8d307aaba0e7d68 Author: Jens Axboe <jens.axboe@oracle.com> Date: Fri Jun 6 11:18:06 2008 +0200 smp_call_function: get rid of the unused nonatomic/retry argument causes a build error on s390. CC arch/s390/kernel/time.o arch/s390/kernel/time.c: In function 'stp_work_fn': arch/s390/kernel/time.c:1448: error: too many arguments to function 'smp_call_function' arch/s390/kernel/time.c:1481: error: too many arguments to function 'smp_call_function' The fix is simple and obvious, remove the unneeded argument. Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
2008-07-14sparc64: sysdev API change falloutStephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2008-07-14Merge commit 'voltage/reg-for-linus'Stephen Rothwell
2008-07-14Merge commit 'mips/mips-for-linux-next'Stephen Rothwell
2008-07-14Merge commit 'generic-ipi/auto-generic-ipi-next'Stephen Rothwell
Conflicts: arch/powerpc/mm/slice.c arch/s390/kernel/time.c arch/x86/kvm/vmx.c init/main.c net/iucv/iucv.c virt/kvm/kvm_main.c
2008-07-14Merge commit 'kmemcheck/auto-kmemcheck-next'Stephen Rothwell
Conflicts: arch/x86/kernel/traps_64.c arch/x86/mm/Makefile include/asm-x86/pgtable.h kernel/sysctl.c
2008-07-14Merge commit 'cris/for-next'Stephen Rothwell
2008-07-14Merge commit 'm68knommu/for-next'Stephen Rothwell
2008-07-14Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2008-07-14Merge commit 'leds/for-mm'Stephen Rothwell
2008-07-14Merge commit 'trivial/next'Stephen Rothwell
Conflicts: include/linux/securebits.h
2008-07-14Merge commit 'bkl-removal/bkl-removal'Stephen Rothwell
Conflicts: fs/nfs/file.c
2008-07-14Merge commit 'semaphore-removal/semaphore-removal'Stephen Rothwell
Conflicts: drivers/net/ps3_gelic_wireless.c drivers/scsi/qla2xxx/qla_attr.c drivers/scsi/qla2xxx/qla_def.h drivers/scsi/qla2xxx/qla_mbx.c drivers/scsi/qla2xxx/qla_mid.c drivers/scsi/qla2xxx/qla_os.c
2008-07-14Merge commit 'mmc/next'Stephen Rothwell
2008-07-14Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: drivers/char/hvc_console.h kernel/stop_machine.c kernel/sysctl.c
2008-07-14Merge commit 'cpufreq/next'Stephen Rothwell
Conflicts: drivers/cpufreq/cpufreq.c
2008-07-14Merge commit 'arm/devel'Stephen Rothwell
Conflicts: arch/arm/kernel/time.c arch/arm/mach-at91/board-yl-9200.c drivers/usb/gadget/ether.c
2008-07-14Merge commit 'crypto/master'Stephen Rothwell
2008-07-14Merge commit 'mtd/master'Stephen Rothwell
2008-07-14Merge commit 'galak/powerpc-next'Stephen Rothwell
Conflicts: Documentation/powerpc/booting-without-of.txt
2008-07-14Merge commit 'sparc/master'Stephen Rothwell
2008-07-14Merge commit 'net/master'Stephen Rothwell
Conflicts: Documentation/powerpc/booting-without-of.txt drivers/net/fs_enet/fs_enet-main.c drivers/pci/pci-acpi.c net/netfilter/nf_conntrack_proto_tcp.c
2008-07-14Merge commit 'async_tx/next'Stephen Rothwell
2008-07-14Merge commit '4xx/next'Stephen Rothwell
2008-07-14Merge commit 'powerpc/next'Stephen Rothwell
Conflicts: arch/powerpc/Kconfig drivers/macintosh/mediabay.c
2008-07-14Merge branch 'quilt/m68k'Stephen Rothwell
2008-07-14Merge commit 'ia64/test'Stephen Rothwell
2008-07-14Merge commit 'origin/HEAD' into test-mergeBenjamin Herrenschmidt
Manual fixup of include/asm-powerpc/pgtable-ppc64.h
2008-07-14Merge commit 'kvm/master'Stephen Rothwell
2008-07-14Merge commit 'acpi/test'Stephen Rothwell
Conflicts: arch/x86/kernel/process.c arch/x86/mm/srat_32.c drivers/acpi/processor_throttling.c drivers/acpi/sleep/main.c drivers/pci/pci.c drivers/pci/pci.h include/acpi/acpi_bus.h
2008-07-14Merge commit 'kbuild/master'Stephen Rothwell
2008-07-14Merge commit 'sh/master'Stephen Rothwell
2008-07-14Merge commit 's390/features'Stephen Rothwell
Conflicts: drivers/s390/block/dasd.c drivers/s390/block/dasd_eckd.c drivers/s390/block/dasd_fba.c drivers/s390/char/tape_core.c drivers/s390/cio/device_fsm.c drivers/s390/cio/qdio.c drivers/s390/net/claw.c drivers/s390/net/ctcm_main.c drivers/s390/net/lcs.c drivers/s390/net/netiucv.c
2008-07-14Merge commit 'avr32/avr32-arch'Stephen Rothwell
2008-07-14Merge branch 'quilt/i2c'Stephen Rothwell
Conflicts: drivers/i2c/i2c-core.c
2008-07-14Merge commit 'pci/linux-next'Stephen Rothwell
Conflicts: arch/sparc64/kernel/pci.c arch/x86/kernel/setup_64.c arch/x86/pci/irq.c arch/x86/pci/pci.h include/linux/device.h
2008-07-14Merge commit 'x86/auto-x86-next'Stephen Rothwell
Conflicts: arch/x86/kernel/Makefile arch/x86/kernel/entry_32.S arch/x86/kernel/process_32.c arch/x86/kernel/process_64.c arch/x86/kernel/traps_32.c arch/x86/kernel/traps_64.c arch/x86/lib/Makefile drivers/base/topology.c include/asm-x86/irqflags.h
2008-07-14Merge commit 'timers/auto-timers-next'Stephen Rothwell
2008-07-14Merge commit 'stackprotector/auto-stackprotector-next'Stephen Rothwell
2008-07-14Merge commit 'sched/auto-sched-next'Stephen Rothwell
Conflicts: kernel/Makefile kernel/sched.c kernel/sched_rt.c
2008-07-14Merge commit 'safe-poison-pointers/auto-safe-poison-pointers-next'Stephen Rothwell
2008-07-14Merge commit 'genirq/auto-genirq-next'Stephen Rothwell
2008-07-14Merge commit 'ftrace/auto-ftrace-next'Stephen Rothwell
2008-07-14Merge commit 'cpus4096/auto-cpus4096-next'Stephen Rothwell
2008-07-14Merge commit 'tip-core/auto-core-next'Stephen Rothwell
2008-07-14Merge branch 'quilt/driver-core'Stephen Rothwell
2008-07-14Merge commit 'sparc-current/master'Stephen Rothwell
2008-07-14misc:down_nowait-arch_ia64_kernel_salinfoRusty Russell
down_trylock -> down_try in arch/ia64/kernel/salinfo.c Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2008-07-14stop_machine:use-mask-fixup-callersRusty Russell
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-30 15:05:18 +0000