From 9ded830960a8b3b9e62e1f29215b0e26b715aec2 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 16 May 2007 21:21:33 -0700 Subject: [PATCH] --- yaml --- r: 56499 b: refs/heads/master c: b17bfca5f16a6090ee51250163e1720f6fe71515 h: refs/heads/master i: 56497: 69134ce7fa1abedf5d3a40b40ef521089dd40f3d 56495: 48119626b8c7058c15aba5af59755e0bebe05a63 v: v3 --- [refs] | 2 +- trunk/arch/avr32/boards/atstk1000/atstk1000.h | 15 + trunk/arch/avr32/boards/atstk1000/atstk1002.c | 10 +- trunk/arch/avr32/boards/atstk1000/setup.c | 45 ++- trunk/arch/avr32/kernel/irq.c | 9 - trunk/arch/avr32/kernel/kprobes.c | 7 +- trunk/arch/avr32/kernel/syscall_table.S | 3 + trunk/arch/avr32/mach-at32ap/at32ap7000.c | 77 +++-- trunk/arch/avr32/mm/fault.c | 36 +-- trunk/arch/ia64/kernel/acpi.c | 2 +- trunk/arch/ia64/kernel/crash.c | 24 +- trunk/arch/ia64/kernel/entry.S | 3 + trunk/arch/ia64/kernel/irq.c | 6 +- trunk/arch/ia64/kernel/irq_lsapic.c | 2 +- trunk/arch/ia64/kernel/kprobes.c | 15 +- trunk/arch/ia64/kernel/mca.c | 5 +- trunk/arch/ia64/kernel/mca_drv.c | 4 +- trunk/arch/ia64/kernel/module.c | 2 +- trunk/arch/ia64/kernel/perfmon.c | 18 +- trunk/arch/ia64/kernel/perfmon_mckinley.h | 2 +- trunk/arch/ia64/kernel/sal.c | 2 +- trunk/arch/ia64/kernel/salinfo.c | 2 +- trunk/arch/ia64/kernel/setup.c | 6 +- trunk/arch/ia64/kernel/smp.c | 12 +- trunk/arch/ia64/kernel/smpboot.c | 6 +- trunk/arch/ia64/kernel/traps.c | 2 +- trunk/arch/ia64/kernel/unwind.c | 2 +- trunk/arch/ia64/mm/discontig.c | 2 +- trunk/arch/ia64/mm/fault.c | 41 +-- trunk/arch/ia64/sn/kernel/bte.c | 12 +- trunk/arch/ia64/sn/kernel/bte_error.c | 4 +- trunk/arch/ia64/sn/kernel/io_common.c | 2 +- trunk/arch/ia64/sn/kernel/setup.c | 2 +- trunk/arch/ia64/sn/kernel/sn2/sn2_smp.c | 2 +- trunk/arch/ia64/sn/kernel/xpc_channel.c | 8 +- trunk/arch/ia64/sn/kernel/xpnet.c | 2 +- trunk/arch/ia64/sn/pci/pci_dma.c | 8 +- trunk/arch/ia64/sn/pci/pcibr/pcibr_ate.c | 6 +- trunk/arch/ia64/sn/pci/pcibr/pcibr_dma.c | 2 +- trunk/arch/ia64/sn/pci/tioca_provider.c | 6 +- trunk/arch/ia64/sn/pci/tioce_provider.c | 16 +- trunk/arch/sparc64/kernel/Makefile | 2 +- trunk/arch/sparc64/kernel/entry.S | 94 ++++++ trunk/arch/sparc64/kernel/hvapi.c | 189 ++++++++++++ trunk/arch/sparc64/kernel/setup.c | 3 + trunk/drivers/parport/parport_pc.c | 1 + trunk/drivers/serial/sunhv.c | 276 +++++++++++++----- trunk/drivers/spi/spidev.c | 2 +- trunk/fs/afs/super.c | 1 - trunk/fs/afs/write.c | 3 +- trunk/include/asm-avr32/arch-at32ap/board.h | 8 +- trunk/include/asm-avr32/kdebug.h | 17 +- trunk/include/asm-avr32/kprobes.h | 1 + trunk/include/asm-avr32/unistd.h | 5 +- trunk/include/asm-ia64/kdebug.h | 16 +- trunk/include/asm-ia64/kprobes.h | 1 + trunk/include/asm-ia64/unistd.h | 5 +- trunk/include/asm-sparc64/hypervisor.h | 83 +++++- trunk/include/linux/slub_def.h | 2 +- trunk/kernel/power/main.c | 15 +- trunk/mm/filemap.c | 3 +- trunk/mm/slub.c | 2 +- 62 files changed, 880 insertions(+), 281 deletions(-) create mode 100644 trunk/arch/avr32/boards/atstk1000/atstk1000.h create mode 100644 trunk/arch/sparc64/kernel/hvapi.c diff --git a/[refs] b/[refs] index b5829fe8505d..8898fdc7b2be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a04395ead6d17c83da64264b6fe78f852a648202 +refs/heads/master: b17bfca5f16a6090ee51250163e1720f6fe71515 diff --git a/trunk/arch/avr32/boards/atstk1000/atstk1000.h b/trunk/arch/avr32/boards/atstk1000/atstk1000.h new file mode 100644 index 000000000000..9a49ed036b72 --- /dev/null +++ b/trunk/arch/avr32/boards/atstk1000/atstk1000.h @@ -0,0 +1,15 @@ +/* + * ATSTK1000 setup code: Daughterboard interface + * + * Copyright (C) 2007 Atmel Corporation + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#ifndef __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H +#define __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H + +extern struct atmel_lcdfb_info atstk1000_lcdc_data; + +#endif /* __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H */ diff --git a/trunk/arch/avr32/boards/atstk1000/atstk1002.c b/trunk/arch/avr32/boards/atstk1000/atstk1002.c index abe6ca203fa7..fe1dbe2e28f4 100644 --- a/trunk/arch/avr32/boards/atstk1000/atstk1002.c +++ b/trunk/arch/avr32/boards/atstk1000/atstk1002.c @@ -16,6 +16,8 @@ #include #include +#include