summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2008-07-03Merge 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-03Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: drivers/char/hvc_console.h kernel/stop_machine.c
2008-07-03Merge commit 'cpufreq/next'Stephen Rothwell
Conflicts: drivers/cpufreq/cpufreq.c
2008-07-03Merge commit 'arm/devel'Stephen Rothwell
Conflicts: arch/arm/mach-at91/board-yl-9200.c
2008-07-03Merge commit 'mtd/master'Stephen Rothwell
2008-07-03Merge commit 'galak/powerpc-next'Stephen Rothwell
2008-07-03Merge commit 'sparc/master'Stephen Rothwell
Conflicts: include/asm-m68k/sbus.h
2008-07-03Merge commit 'net/master'Stephen Rothwell
Conflicts: Documentation/feature-removal-schedule.txt Documentation/powerpc/booting-without-of.txt drivers/net/fs_enet/fs_enet-main.c drivers/net/wireless/iwlwifi/iwl-4965.c
2008-07-03Merge commit 'powerpc/powerpc-next'Stephen Rothwell
Conflicts: arch/powerpc/sysdev/fsl_soc.c drivers/macintosh/mediabay.c
2008-07-03Merge branch 'quilt/m68k'Stephen Rothwell
2008-07-03Merge commit 'ia64/test'Stephen Rothwell
2008-07-03Merge commit 'kvm/master'Stephen Rothwell
2008-07-03Merge commit 'acpi/test'Stephen Rothwell
Conflicts: Documentation/kernel-parameters.txt arch/ia64/kernel/process.c arch/x86/kernel/process.c arch/x86/kernel/srat_32.c drivers/acpi/processor_core.c drivers/acpi/processor_throttling.c drivers/acpi/sleep/main.c include/asm-ia64/processor.h include/asm-x86/processor.h
2008-07-03Merge commit 'sh/master'Stephen Rothwell
2008-07-03Merge 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-03Merge commit 'avr32/avr32-arch'Stephen Rothwell
2008-07-03Merge branch 'quilt/i2c'Stephen Rothwell
Conflicts: drivers/i2c/i2c-core.c
2008-07-03Merge commit 'pci/linux-next'Stephen Rothwell
Conflicts: arch/x86/kernel/setup_64.c arch/x86/pci/irq.c arch/x86/pci/pci.h drivers/pci/probe.c include/linux/device.h
2008-07-03Merge commit 'x86/auto-x86-next'Stephen Rothwell
Conflicts: arch/x86/kernel/entry_32.S arch/x86/kernel/process_32.c arch/x86/kernel/process_64.c
2008-07-03Merge commit 'timers/auto-timers-next'Stephen Rothwell
2008-07-03Merge commit 'stackprotector/auto-stackprotector-next'Stephen Rothwell
2008-07-03Merge commit 'sched/auto-sched-next'Stephen Rothwell
Conflicts: kernel/Makefile kernel/sched.c kernel/sched_rt.c
2008-07-03Merge commit 'safe-poison-pointers/auto-safe-poison-pointers-next'Stephen Rothwell
2008-07-03Merge commit 'genirq/auto-genirq-next'Stephen Rothwell
2008-07-03Merge commit 'ftrace/auto-ftrace-next'Stephen Rothwell
2008-07-03Merge commit 'cpus4096/auto-cpus4096-next'Stephen Rothwell
2008-07-03Merge commit 'tip-core/auto-core-next'Stephen Rothwell
2008-07-03Merge branch 'quilt/driver-core'Stephen Rothwell
2008-07-03Merge commit 'arm-current/master'Stephen Rothwell
2008-07-03Merge commit 'sparc-current/master'Stephen Rothwell
2008-07-03Merge commit 'powerpc-merge/merge'Stephen Rothwell
2008-07-03misc: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-03s390: use virtio_console for KVM on s390Christian Borntraeger
This patch enables virtio_console as the default console on kvm for s390. We currently use the same notify hack as lguest for early console output. I will try to address this for lguest and s390 later. Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2008-07-03arch/m68k/mm/Sun3mmu.c: Eliminate NULL test and memset after alloc_bootmemJulia Lawall
As noted by Akinobu Mita in patch b1fceac2b9e04d278316b2faddf276015fc06e3b, alloc_bootmem and related functions never return NULL and always return a zeroed region of memory. Thus a NULL test or memset after calls to these functions is unnecessary. This was fixed using the following semantic patch. (http://www.emn.fr/x-info/coccinelle/) // <smpl> @@ expression E; statement S; @@ E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...) ... when != E ( - BUG_ON (E == NULL); | - if (E == NULL) S ) @@ expression E,E1; @@ E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...) ... when != E - memset(E,0,E1); // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2008-07-03arch/m68k/mm/motorola.c: Eliminate NULL test and memset after alloc_bootmemJulia Lawall
As noted by Akinobu Mita in patch b1fceac2b9e04d278316b2faddf276015fc06e3b, alloc_bootmem and related functions never return NULL and always return a zeroed region of memory. Thus a NULL test or memset after calls to these functions is unnecessary. This was fixed using the following semantic patch. (http://www.emn.fr/x-info/coccinelle/) // <smpl> @@ expression E; statement S; @@ E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...) ... when != E ( - BUG_ON (E == NULL); | - if (E == NULL) S ) @@ expression E,E1; @@ E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...) ... when != E - memset(E,0,E1); // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2008-07-03m68k/Atari: remove the dead ATARI_SCC{,_DMA} optionsAdrian Bunk
It seems the driver was removed back in kernel 2.3 but the options were forgotten. Reported-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2008-07-03m68k/Mac: remove the unused ADB_KEYBOARD optionAdrian Bunk
When the driver was removed back in 2002 the option was forgotten. Reported-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2008-07-03m68k/apollo: Add missing call to apollo_parse_bootinfo()Geert Uytterhoeven
Add the missing call to apollo_parse_bootinfo(), which had been lost from a big Apollo support patch by Peter De Schrijver in 1999. Thanks to Adrian Bunk for noticing! Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2008-07-03m68k/sun3/: possible cleanupsAdrian Bunk
This patch contains the following possible cleanups: - make the following needlessly global code static: - config.c: sun3_bootmem_alloc() - config.c: sun3_sched_init() - dvma.c: dvma_page() - idprom.c: struct Sun_Machines[] - mmu_emu.c: struct ctx_alloc[] - sun3dvma.c: iommu_use[] - sun3ints.c: led_pattern[] - remove the unused sbus.c Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2008-07-03m68k/q40/config.c: make functions staticAdrian Bunk
This patch makes the following needlessly global functions static: - q40_reset() - q40_halt() - q40_disable_irqs() - q40_gettimeoffset() - q40_hwclk() - q40_get_ss() - q40_set_clock_mmss() Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2008-07-03m68k/mac/: possible cleanupsAdrian Bunk
This patch contains the following possible cleanups: - make the following needlessly global code (always) static: - baboon.c: struct baboon - baboon.c: baboon_irq() - config.c: mac_orig_videoaddr - config.c: mac_identify() - config.c: mac_report_hardware() - config.c: mac_debug_console_write() - config.c: mac_sccb_console_write() - config.c: mac_scca_console_write() - config.c: mac_init_scc_port() - oss.c: oss_irq() - oss.c: oss_nubus_irq() - psc.c: psc_debug_dump() - psc.c: psc_dma_die_die_die() - via.c: rbv_clear - remove the unused bootparse.c - #if 0 the following unused functions: - config.c: mac_debugging_short() - config.c: mac_debugging_long() - remove the following unused code: - config.c: mac_bisize - config.c: mac_env - config.c: mac_SCC_init_done - config.c: mac_SCC_reset_done - config.c: mac_init_scca_port() - config.c: mac_init_sccb_port() Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2008-07-03m68k/atari/debug.c: possible cleanupsAdrian Bunk
This patch contains the following possible cleanups: - make the following needlessly global functions (always) static: - atari_mfp_console_write() - atari_scc_console_write() - atari_midi_console_write() - atari_init_mfp_port() - atari_init_scc_port() - atari_init_midi_port() - #if 0 the following unused functions: - atari_mfp_console_wait_key() - atari_scc_console_wait_key() - atari_midi_console_wait_key() - remove the following unused variables: - atari_MFP_init_done - atari_SCC_init_done Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2008-07-03m68k/amiga/: possible cleanupsAdrian Bunk
This patch contains the following possible cleanups: - amiints.c: add a proper prototype for amiga_init_IRQ() in include/asm-m68k/amigaints.h - make the following needlessly global code static: - config.c: amiga_model - config.c: amiga_psfreq - config.c: amiga_serial_console_write() - #if 0 the following unused functions: - config.c: amiga_serial_puts() - config.c: amiga_serial_console_wait_key() - config.c: amiga_serial_gets() - remove the following unused variable: - config.c: amiga_masterclock Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2008-07-03export amiga_vblankAdrian Bunk
This patch fixes the following build error: <-- snip --> ... Building modules, stage 2. MODPOST 1203 modules ERROR: "amiga_vblank" [drivers/video/amifb.ko] undefined! ... make[2]: *** [__modpost] Error 1 <-- snip --> Reported-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2008-07-03m68k: remove AP1000 codeAdrian Bunk
Unless I miss something that's code for a sparc machine even the sparc code no longer supports that got copied to m68k when these files were copied. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2008-07-03m68k: make multi_defconfig the default defconfigAdrian Bunk
It seems to match the intention behind multi_defconfig to make it the default defconfig. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2008-07-03Stringify support commasMathieu Desnoyers
> This is a no-no for those archs that still use -traditional. > > I dunno if this is a problem for you at the moment and the > > right fix is anyway to nuke -traditional. > > > > Sam Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2008-07-03m68k: Allow no CPU/platform type for allnoconfigGeert Uytterhoeven
Allow no CPU/platform type for allnoconfig - Provide a dummy value for FPSTATESIZE if no CPU type was selected - Provide a dummy value for NR_IRQS if no platform type was selected - Warn the user if no CPU or platform type was selected Note: you still cannot build an allnoconfig kernel, as CONFIG_SWAP=n doesn't build and we cannot easily fix that (http://groups.google.com/group/linux.kernel/browse_thread/thread/d430c78b07e1827b) Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2008-07-03m68k: vmlinux-std/sun3.lds.S cleanup - use PAGE_SIZE macroCyrill Gorcunov
This patch includes page.h header into linker script that allow us to use PAGE_SIZE macro instead of numeric constant Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2008-07-03m68k: remove CVS keywordsAdrian Bunk
This patch removes CVS keywords that weren't updated for a long time from comments. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 20:37:02 +0000