Skip to content

L
linux
Commit 36b8c405 authored by Anton Blanchard's avatar Anton Blanchard
Browse files
Options

Merge samba.org:/scratch/anton/linux-2.5 

into samba.org:/scratch/anton/linux-2.5_ppc64_work
parents 348ed50d 90a8d4f3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 27859 additions and 12430 deletions
CREDITS
View file @ 36b8c405
......@@ -753,6 +753,14 @@ S: One Dell Way
S: Round Rock, TX 78682
S: USA
N: John G Dorsey
E: john+@cs.cmu.edu
D: ARM Linux ports to Assabet/Neponset, Spot
S: Department of Electrical and Computer Engineering
S: Carnegie Mellon University
S: Pittsburgh, PA 15213
S: USA
N: Eddie C. Dost
E: ecd@skynet.be
D: Linux/Sparc kernel hacker
......@@ -1284,7 +1292,7 @@ S: 14059 Berlin
S: Germany
N: David Hinds
E: dhinds@zen.stanford.edu
E: dahinds@users.sourceforge.net
W: http://tao.stanford.edu/~dhinds
D: PCMCIA and CardBus stuff, PCMCIA-HOWTO, PCMCIA client drivers
S: 2019 W. Middlefield Rd #1
......@@ -2218,6 +2226,15 @@ S: 30 White Tail Lane
S: Lafayette, Indiana 47905
S: USA
N: Scott Murray
E: scottm@somanetworks.com
E: scott@spiteful.org
D: OPL3-SA2, OPL3-SA3 sound driver
D: CompactPCI hotplug core
D: Ziatech ZT5550 and generic CompactPCI hotplug drivers
S: Toronto, Ontario
S: Canada
N: Trond Myklebust
E: trond.myklebust@fys.uio.no
D: current NFS client hacker.
......@@ -2269,6 +2286,15 @@ S: 521 Pleasant Valley Road
S: Potsdam, New York 13676
S: USA
N: Dave Neuer
E: dneuer@innovation-charter.com
E: mr_fred_smoothie@yahoo.com
D: Helped implement support for Compaq's H31xx series iPAQs
D: Other mostly minor tweaks & bugfixes
S: 325 E. Main St., Suite 3
S: Carnegie, PA 15105
S: USA
N: Michael Neuffer
E: mike@i-Connect.Net
E: neuffer@goofy.zdv.uni-mainz.de
......@@ -2433,6 +2459,7 @@ S: ask per mail for current address
N: Nicolas Pitre
E: nico@cam.org
D: StrongARM SA1100 support integrator & hacker
D: Xscale PXA architecture
S: Montreal, Quebec, Canada
N: Ken Pizzini
......@@ -2704,6 +2731,12 @@ S: Valurink. 4A11
S: 03600 Karkkila
S: Finland
N: Deepak Saxena
E: deepak@csociety.purdue.edu
D: I2O kernel layer (config, block, core, pci, net). I2O disk support for LILO
D: XScale(IOP310) porting
S: Tempe, Arizona
N: Eric Schenk
E: Eric.Schenk@dna.lth.se
D: Random kernel debugging.
......
Documentation/networking/pktgen.txt 0 → 100644
View file @ 36b8c405
How to use the Linux packet generator module.
1. Enable CONFIG_NET_PKTGEN to compile and build pktgen.o, install it
in the place where insmod may find it.
2. Cut script "ipg" (see below).
3. Edit script to set preferred device and destination IP address.
3a. Create more scripts for different interfaces. Up to thirty-two
pktgen processes can be configured and run at once by using the
32 /proc/net/pktgen/pg* files.
4. Run in shell: ". ipg"
5. After this two commands are defined:
A. "pg" to start generator and to get results.
B. "pgset" to change generator parameters. F.e.
pgset "clone_skb 100" sets the number of coppies of the same packet
will be sent before a new packet is allocated
pgset "clone_skb 0" use multiple SKBs for packet generation
pgset "pkt_size 9014" sets packet size to 9014
pgset "frags 5" packet will consist of 5 fragments
pgset "count 200000" sets number of packets to send, set to zero
for continious sends untill explicitly
stopped.
pgset "ipg 5000" sets artificial gap inserted between packets
to 5000 nanoseconds
pgset "dst 10.0.0.1" sets IP destination address
(BEWARE! This generator is very aggressive!)
pgset "dst_min 10.0.0.1" Same as dst
pgset "dst_max 10.0.0.254" Set the maximum destination IP.
pgset "src_min 10.0.0.1" Set the minimum (or only) source IP.
pgset "src_max 10.0.0.254" Set the maximum source IP.
pgset "dstmac 00:00:00:00:00:00" sets MAC destination address
pgset "srcmac 00:00:00:00:00:00" sets MAC source address
pgset "src_mac_count 1" Sets the number of MACs we'll range through. The
'minimum' MAC is what you set with srcmac.
pgset "dst_mac_count 1" Sets the number of MACs we'll range through. The
'minimum' MAC is what you set with dstmac.
pgset "flag [name]" Set a flag to determine behaviour. Current flags
are: IPSRC_RND #IP Source is random (between min/max),
IPDST_RND, UDPSRC_RND,
UDPDST_RND, MACSRC_RND, MACDST_RND
pgset "udp_src_min 9" set UDP source port min, If < udp_src_max, then
cycle through the port range.
pgset "udp_src_max 9" set UDP source port max.
pgset "udp_dst_min 9" set UDP destination port min, If < udp_dst_max, then
cycle through the port range.
pgset "udp_dst_max 9" set UDP destination port max.
pgset stop aborts injection
Also, ^C aborts generator.
---- cut here
#! /bin/sh
modprobe pktgen
PGDEV=/proc/net/pktgen/pg0
function pgset() {
local result
echo $1 > $PGDEV
result=`cat $PGDEV | fgrep "Result: OK:"`
if [ "$result" = "" ]; then
cat $PGDEV | fgrep Result:
fi
}
function pg() {
echo inject > $PGDEV
cat $PGDEV
}
pgset "odev eth0"
pgset "dst 0.0.0.0"
---- cut here
MAINTAINERS
View file @ 36b8c405
......@@ -222,6 +222,13 @@ P: Dave Gilbert
M: linux@treblig.org
S: Maintained
ARM/PT DIGITAL BOARD PORT
P: Stefan Eletzhofer
M: stefan.eletzhofer@eletztrick.de
L: linux-arm-kernel@lists.arm.linux.org.uk
W: http://www.arm.linux.org.uk/
S: Maintained
ARM/SHARK MACHINE SUPPORT
P: Alexander Schulz
M: alex@shark-linux.de
......@@ -317,6 +324,27 @@ L: codalist@coda.cs.cmu.edu
W: http://www.coda.cs.cmu.edu/
S: Maintained
COMPACTPCI HOTPLUG CORE
P: Scott Murray
M: scottm@somanetworks.com
M: scott@spiteful.org
L: pcihpd-discuss@lists.sourceforge.net
S: Supported
COMPACTPCI HOTPLUG ZIATECH ZT5550 DRIVER
P: Scott Murray
M: scottm@somanetworks.com
M: scott@spiteful.org
L: pcihpd-discuss@lists.sourceforge.net
S: Supported
COMPACTPCI HOTPLUG GENERIC DRIVER
P: Scott Murray
M: scottm@somanetworks.com
M: scott@spiteful.org
L: pcihpd-discuss@lists.sourceforge.net
S: Supported
COMPAQ FIBRE CHANNEL 64-bit/66MHz PCI non-intelligent HBA
P: Amy Vanzant-Hodge
M: Amy Vanzant-Hodge (fibrechannel@compaq.com)
......@@ -1294,7 +1322,7 @@ S: Maintained
PCMCIA SUBSYSTEM
P: David Hinds
M: dhinds@zen.stanford.edu
M: dahinds@users.sourceforge.net
L: linux-kernel@vger.kernel.org
W: http://pcmcia-cs.sourceforge.net
S: Maintained
......@@ -1407,7 +1435,7 @@ S: Supported
SA1100 SUPPORT
P: Nicolas Pitre
M: nico@cam.org
L: sa1100-linux@pa.dec.com
L: linux-arm@lists.arm.linux.org.uk
S: Maintained
SBPCD CDROM DRIVER
......
Makefile
View file @ 36b8c405
......@@ -175,7 +175,7 @@ AFLAGS := -D__ASSEMBLY__ $(CPPFLAGS)
export VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION KERNELRELEASE ARCH \
CONFIG_SHELL TOPDIR HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \
CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE \
HOSTCXX HOSTCXXFLAGS
HOSTCXX HOSTCXXFLAGS LDFLAGS_BLOB
export CPPFLAGS NOSTDINC_FLAGS OBJCOPYFLAGS LDFLAGS
export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
......
arch/alpha/Makefile
View file @ 36b8c405
......@@ -12,7 +12,7 @@ NM := $(NM) -B
LDFLAGS_vmlinux = -static -N #-relax
CFLAGS := $(CFLAGS) -pipe -mno-fp-regs -ffixed-8
ARCHBLOBLFLAGS := -I binary -O elf64-alpha -B alpha
LDFLAGS_BLOB := --format binary --oformat elf64-alpha
# Determine if we can use the BWX instructions with GAS.
old_gas := $(shell if $(AS) --version 2>&1 | grep 'version 2.7' > /dev/null; then echo y; else echo n; fi)
......
arch/alpha/kernel/pci.c
View file @ 36b8c405
......@@ -340,7 +340,7 @@ common_swizzle(struct pci_dev *dev, u8 *pinp)
return PCI_SLOT(dev->devfn);
}
void __init
void __devinit
pcibios_fixup_pbus_ranges(struct pci_bus * bus,
struct pbus_set_ranges_data * ranges)
{
......
arch/alpha/vmlinux.lds.S
View file @ 36b8c405
......@@ -69,7 +69,7 @@ SECTIONS
.init.ramfs ALIGN(8192): {
__initramfs_start = .;
*(.init.initramfs)
*(.init.ramfs)
__initramfs_end = .;
}
......
arch/arm/Makefile
View file @ 36b8c405
......@@ -8,6 +8,7 @@
# Copyright (C) 1995-2001 by Russell King
LDFLAGS_vmlinux :=-p -X
LDFLAGS_BLOB :=--format binary
AFLAGS_vmlinux.lds.o = -DTEXTADDR=$(TEXTADDR) -DDATAADDR=$(DATAADDR)
OBJCOPYFLAGS :=-O binary -R .note -R .comment -S
GZFLAGS :=-9
......@@ -60,6 +61,7 @@ AFLAGS +=$(apcs-y) $(arch-y) -mno-fpu -msoft-float -Wa,-mno-fpu
ifeq ($(CONFIG_CPU_26),y)
PROCESSOR := armo
HEAD := arch/arm/mach-arc/head.o arch/arm/kernel/init_task.o
LDFLAGS_BLOB += --oformat elf26-littlearm
ifeq ($(CONFIG_ROM_KERNEL),y)
DATAADDR = 0x02080000
TEXTADDR = 0x03800000
......@@ -72,6 +74,7 @@ ifeq ($(CONFIG_CPU_32),y)
PROCESSOR = armv
HEAD := arch/arm/kernel/head.o arch/arm/kernel/init_task.o
TEXTADDR = 0xC0008000
LDFLAGS_BLOB += --oformat elf32-littlearm
endif
ifeq ($(CONFIG_ARCH_ARCA5K),y)
......
arch/arm/def-configs/neponset
View file @ 36b8c405
This diff is collapsed.
arch/arm/def-configs/rpc
View file @ 36b8c405
This diff is collapsed.
arch/arm/kernel/process.c
View file @ 36b8c405
......@@ -391,12 +391,12 @@ void dump_thread(struct pt_regs * regs, struct user * dump)
*/
pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
{
pid_t __ret;
register unsigned int r0 asm("r0") = flags | CLONE_VM | CLONE_UNTRACED;
register unsigned int r1 asm("r1") = 0;
register pid_t __ret asm("r0");
__asm__ __volatile__(
"orr r0, %1, %2 @ kernel_thread sys_clone \n\
mov r1, #0 \n\
"__syscall(clone)" \n\
__syscall(clone)" @ kernel_thread sys_clone \n\
movs %0, r0 @ if we are the child \n\
bne 1f \n\
mov fp, #0 @ ensure that fp is zero \n\
......@@ -406,8 +406,8 @@ pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
b sys_exit \n\
1: "
: "=r" (__ret)
: "Ir" (flags), "r" (CLONE_VM | CLONE_UNTRACED), "r" (fn), "r" (arg)
: "r0", "r1", "lr");
: "0" (r0), "r" (r1), "r" (fn), "r" (arg)
: "lr");
return __ret;
}
......
arch/arm/mm/Makefile
View file @ 36b8c405
......@@ -34,7 +34,7 @@ p-$(CONFIG_CPU_SA110) += proc-sa110.o tlb-v4wb.o copypage-v4wb.o abort-ev4.o
p-$(CONFIG_CPU_SA1100) += proc-sa110.o tlb-v4wb.o copypage-v4mc.o abort-ev4.o minicache.o
# ARMv5
p-$(CONFIG_CPU_ARM926T) += proc-arm926.o tlb-v4wb.o copypage-v4wb.o abort-ev5ej.o
p-$(CONFIG_CPU_ARM926T) += proc-arm926.o tlb-v4wb.o copypage-v4wb.o abort-ev5tej.o
p-$(CONFIG_CPU_XSCALE) += proc-xscale.o tlb-v4wb.o copypage-xscale.o abort-xscale.o minicache.o
obj-y += $(sort $(p-y))
......
arch/arm/vmlinux-armv.lds.in
View file @ 36b8c405
......@@ -37,7 +37,7 @@ SECTIONS
__initcall_end = .;
. = ALIGN(32);
__initramfs_start = .;
*(.init.initramfs)
usr/built-in.o(.init.ramfs)
__initramfs_end = .;
. = ALIGN(4096);
__init_end = .;
......
arch/cris/drivers/ethernet.c
View file @ 36b8c405
......@@ -234,8 +234,8 @@ static struct sk_buff *tx_skb;
static unsigned int network_rec_config_shadow = 0;
/* Network speed indication. */
static struct timer_list speed_timer;
static struct timer_list clear_led_timer;
static struct timer_list speed_timer = TIMER_INITIALIZER(NULL, 0, 0);
static struct timer_list clear_led_timer = TIMER_INITIALIZER(NULL, 0, 0);
static int current_speed; /* Speed read from tranceiver */
static int current_speed_selection; /* Speed selected by user */
static int led_next_time;
......
arch/i386/Kconfig
View file @ 36b8c405
......@@ -337,7 +337,6 @@ config PREEMPT
config X86_UP_APIC
bool "Local APIC support on uniprocessors" if !SMP
default y if SMP
---help---
A local APIC (Advanced Programmable Interrupt Controller) is an
integrated interrupt controller in the CPU. If you have a single-CPU
......@@ -447,7 +446,7 @@ config X86_MCE
the 386 and 486, so nearly everyone can say Y here.
config X86_MCE_NONFATAL
bool "Check for non-fatal errors on Athlon/Duron"
bool "Check for non-fatal errors on AMD Athlon/Duron / Intel Pentium 4"
depends on X86_MCE
help
Enabling this feature starts a timer that triggers every 5 seconds which
......@@ -456,12 +455,12 @@ config X86_MCE_NONFATAL
Disable this if you don't want to see these messages.
Seeing the messages this option prints out may be indicative of dying hardware,
or out-of-spec (ie, overclocked) hardware.
This option only does something on hardware with Intel P6 style MCE.
(Pentium Pro and above, AMD Athlon/Duron)
This option only does something on certain CPUs.
(AMD Athlon/Duron and Intel Pentium 4)
config X86_MCE_P4THERMAL
bool "check for P4 thermal throttling interrupt."
depends on X86_MCE && X86_UP_APIC
depends on X86_MCE && (X86_UP_APIC || SMP)
help
Enabling this feature will cause a message to be printed when the P4
enters thermal throttling.
......
arch/i386/Makefile
View file @ 36b8c405
......@@ -18,8 +18,8 @@
LDFLAGS := -m elf_i386
OBJCOPYFLAGS := -O binary -R .note -R .comment -S
ARCHBLOBLFLAGS := -I binary -O elf32-i386 -B i386
LDFLAGS_vmlinux := -e stext
LDFLAGS_BLOB := --format binary --oformat elf32-i386
CFLAGS += -pipe
......@@ -42,7 +42,7 @@ cflags-$(CONFIG_MCRUSOE) += -march=i686 -malign-functions=0 -malign-jumps=0 -mal
cflags-$(CONFIG_MWINCHIPC6) += $(call check_gcc,-march=winchip-c6,-march=i586)
cflags-$(CONFIG_MWINCHIP2) += $(call check_gcc,-march=winchip2,-march=i586)
cflags-$(CONFIG_MWINCHIP3D) += -march=i586
cflags-$(CONFIG_MCYRIXIII) += $(call check_gcc,-march=c3,-march=i586)
cflags-$(CONFIG_MCYRIXIII) += $(call check_gcc,-march=c3,-march=i486) -malign-functions=0 -malign-jumps=0 -malign-loops=0
CFLAGS += $(cflags-y)
......
arch/i386/kernel/Makefile
View file @ 36b8c405
......@@ -8,8 +8,7 @@ export-objs := mca.o i386_ksyms.o time.o
obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o \
pci-dma.o i386_ksyms.o i387.o bluesmoke.o dmi_scan.o \
bootflag.o
pci-dma.o i386_ksyms.o i387.o dmi_scan.o bootflag.o
obj-y += cpu/
obj-y += timers/
......
arch/i386/kernel/cpu/Makefile
View file @ 36b8c405
......@@ -13,7 +13,10 @@ obj-y += rise.o
obj-y += nexgen.o
obj-y += umc.o
obj-$(CONFIG_X86_MCE) += mcheck/
obj-$(CONFIG_MTRR) += mtrr/
obj-$(CONFIG_CPU_FREQ) += cpufreq/
include $(TOPDIR)/Rules.make
arch/i386/kernel/cpu/common.c
View file @ 36b8c405
......@@ -358,7 +358,9 @@ void __init identify_cpu(struct cpuinfo_x86 *c)
boot_cpu_data.x86_capability[3]);
/* Init Machine Check Exception if available. */
#ifdef CONFIG_X86_MCE
mcheck_init(c);
#endif
}
/*
* Perform early boot up checks for a valid TSC. See arch/i386/kernel/time.c
......
arch/i386/kernel/cpu/cyrix.c
View file @ 36b8c405
......@@ -5,6 +5,7 @@
#include <asm/dma.h>
#include <asm/io.h>
#include <asm/processor.h>
#include <asm/timer.h>
#include "cpu.h"
......@@ -170,7 +171,7 @@ static void __init init_cyrix(struct cpuinfo_x86 *c)
c->coma_bug = 1;
break;
case 4: /* MediaGX/GXm */
case 4: /* MediaGX/GXm or Geode GXM/GXLV/GX1 */
#ifdef CONFIG_PCI
/* It isn't really a PCI quirk directly, but the cure is the
same. The MediaGX has deep magic SMM stuff that handles the
......@@ -188,29 +189,26 @@ static void __init init_cyrix(struct cpuinfo_x86 *c)
isa_dma_bridge_buggy = 2;
#endif
c->x86_cache_size=16; /* Yep 16K integrated cache thats it */
/*
* The 5510/5520 companion chips have a funky PIT.
*/
if (pci_find_device(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5510, NULL) ||
pci_find_device(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5520, NULL))
pit_latch_buggy = 1;
/* GXm supports extended cpuid levels 'ala' AMD */
if (c->cpuid_level == 2) {
/* Enable Natsemi MMX extensions */
setCx86(CX86_CCR7, getCx86(CX86_CCR7) | 1);
/* Enable cxMMX extensions (GX1 Datasheet 54) */
setCx86(CX86_CCR7, getCx86(CX86_CCR7)|1);
get_model_name(c); /* get CPU marketing name */
/*
* The 5510/5520 companion chips have a funky PIT
* that breaks the TSC synchronizing, so turn it off
*/
if (pci_find_device(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5510, NULL) ||
pci_find_device(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5520, NULL))
clear_bit(X86_FEATURE_TSC, c->x86_capability);
return;
}
else { /* MediaGX */
Cx86_cb[2] = (dir0_lsn & 1) ? '3' : '4';
p = Cx86_cb+2;
c->x86_model = (dir1 & 0x20) ? 1 : 2;
#ifndef CONFIG_CS5520
clear_bit(X86_FEATURE_TSC, c->x86_capability);
#endif
}
break;
......
arch/i386/kernel/cpu/mcheck/Makefile 0 → 100644
View file @ 36b8c405
obj-y = mce.o k7.o p4.o p5.o p6.o winchip.o
obj-$(CONFIG_X86_MCE_NONFATAL) += non-fatal.o
include $(TOPDIR)/Rules.make
arch/i386/kernel/cpu/mcheck/k7.c 0 → 100644
View file @ 36b8c405
/*
* Athlon specific Machine Check Exception Reporting
*/
#include <linux/init.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/config.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/smp.h>
#include <asm/processor.h>
#include <asm/system.h>
#include <asm/msr.h>
#include "mce.h"
/* Machine Check Handler For AMD Athlon/Duron */
static void k7_machine_check(struct pt_regs * regs, long error_code)
{
int recover=1;
u32 alow, ahigh, high, low;
u32 mcgstl, mcgsth;
int i;
rdmsr (MSR_IA32_MCG_STATUS, mcgstl, mcgsth);
if (mcgstl & (1<<0)) /* Recoverable ? */
recover=0;
printk (KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n",
smp_processor_id(), mcgsth, mcgstl);
for (i=0; i<nr_mce_banks; i++) {
rdmsr (MSR_IA32_MC0_STATUS+i*4,low, high);
if (high&(1<<31)) {
if (high & (1<<29))
recover |= 1;
if (high & (1<<25))
recover |= 2;
printk (KERN_EMERG "Bank %d: %08x%08x", i, high, low);
high &= ~(1<<31);
if (high & (1<<27)) {
rdmsr (MSR_IA32_MC0_MISC+i*4, alow, ahigh);
printk ("[%08x%08x]", ahigh, alow);
}
if (high & (1<<26)) {
rdmsr (MSR_IA32_MC0_ADDR+i*4, alow, ahigh);
printk (" at %08x%08x", ahigh, alow);
}
printk ("\n");
/* Clear it */
wrmsr (MSR_IA32_MC0_STATUS+i*4, 0UL, 0UL);
/* Serialize */
wmb();
}
}
if (recover&2)
panic ("CPU context corrupt");
if (recover&1)
panic ("Unable to continue");
printk (KERN_EMERG "Attempting to continue.\n");
mcgstl &= ~(1<<2);
wrmsr (MSR_IA32_MCG_STATUS,mcgstl, mcgsth);
}
/* AMD K7 machine check is Intel like */
void __init amd_mcheck_init(struct cpuinfo_x86 *c)
{
u32 l, h;
int i;
machine_check_vector = k7_machine_check;
wmb();
printk (KERN_INFO "Intel machine check architecture supported.\n");
rdmsr (MSR_IA32_MCG_CAP, l, h);
if (l & (1<<8)) /* Control register present ? */
wrmsr (MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff);
nr_mce_banks = l & 0xff;
for (i=0; i<nr_mce_banks; i++) {
wrmsr (MSR_IA32_MC0_CTL+4*i, 0xffffffff, 0xffffffff);
wrmsr (MSR_IA32_MC0_STATUS+4*i, 0x0, 0x0);
}
set_in_cr4 (X86_CR4_MCE);
printk (KERN_INFO "Intel machine check reporting enabled on CPU#%d.\n",
smp_processor_id());
#ifdef CONFIG_X86_MCE_NONFATAL
init_nonfatal_mce_checker();
#endif
}
arch/i386/kernel/cpu/mcheck/mce.c 0 → 100644
View file @ 36b8c405
/*
* mce.c - x86 Machine Check Exception Reporting
*/
#include <linux/init.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/config.h>
#include <linux/smp.h>
#include <asm/processor.h>
#include <asm/system.h>
#include <asm/thread_info.h>
#include "mce.h"
int mce_disabled __initdata = 0;
int nr_mce_banks;
/* Handle unconfigured int18 (should never happen) */
static void unexpected_machine_check(struct pt_regs * regs, long error_code)
{
printk(KERN_ERR "CPU#%d: Unexpected int18 (Machine Check).\n", smp_processor_id());
}
/* Call the installed machine check handler for this CPU setup. */
void (*machine_check_vector)(struct pt_regs *, long error_code) = unexpected_machine_check;
asmlinkage void do_machine_check(struct pt_regs * regs, long error_code)
{
machine_check_vector(regs, error_code);
}
/* This has to be run for each processor */
void __init mcheck_init(struct cpuinfo_x86 *c)
{
if (mce_disabled==1)
return;
switch (c->x86_vendor) {
case X86_VENDOR_AMD:
if (c->x86==6 || c->x86==15)
amd_mcheck_init(c);
break;
case X86_VENDOR_INTEL:
if (c->x86==5)
intel_p5_mcheck_init(c);
if (c->x86==6)
intel_p6_mcheck_init(c);
if (c->x86==15)
intel_p4_mcheck_init(c);
break;
case X86_VENDOR_CENTAUR:
if (c->x86==5)
winchip_mcheck_init(c);
break;
default:
break;
}
}
static int __init mcheck_disable(char *str)
{
mce_disabled = 1;
return 0;
}
static int __init mcheck_enable(char *str)
{
mce_disabled = -1;
return 0;
}
__setup("nomce", mcheck_disable);
__setup("mce", mcheck_enable);
arch/i386/kernel/cpu/mcheck/mce.h 0 → 100644
View file @ 36b8c405
#include <linux/init.h>
void amd_mcheck_init(struct cpuinfo_x86 *c);
void intel_p4_mcheck_init(struct cpuinfo_x86 *c);
void intel_p5_mcheck_init(struct cpuinfo_x86 *c);
void intel_p6_mcheck_init(struct cpuinfo_x86 *c);
void winchip_mcheck_init(struct cpuinfo_x86 *c);
void init_nonfatal_mce_checker(void);
/* Call the installed machine check handler for this CPU setup. */
extern void (*machine_check_vector)(struct pt_regs *, long error_code);
extern int mce_disabled __initdata;
extern int nr_mce_banks;
arch/i386/kernel/cpu/mcheck/non-fatal.c 0 → 100644
View file @ 36b8c405
/*
* P4 specific Machine Check Exception Reporting
*/
#include <linux/init.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/jiffies.h>
#include <linux/config.h>
#include <linux/irq.h>
#include <linux/workqueue.h>
#include <linux/interrupt.h>
#include <linux/smp.h>
#include <asm/processor.h>
#include <asm/system.h>
#include <asm/msr.h>
#include "mce.h"
static struct timer_list mce_timer;
static int timerset;
#define MCE_RATE 15*HZ /* timer rate is 15s */
static void mce_checkregs (void *info)
{
u32 low, high;
int i;
preempt_disable();
for (i=0; i<nr_mce_banks; i++) {
rdmsr (MSR_IA32_MC0_STATUS+i*4, low, high);
if (high & (1<<31)) {
printk (KERN_EMERG "MCE: The hardware reports a non fatal, correctable incident occured on CPU %d.\n",
smp_processor_id());
printk (KERN_EMERG "Bank %d: %08x%08x\n", i, high, low);
/* Scrub the error so we don't pick it up in MCE_RATE seconds time. */
wrmsr (MSR_IA32_MC0_STATUS+i*4, 0UL, 0UL);
/* Serialize */
wmb();
}
}
preempt_enable();
}
static void do_mce_timer(void *data)
{
mce_checkregs (NULL);
smp_call_function (mce_checkregs, NULL, 1, 1);
}
static DECLARE_WORK(mce_work, do_mce_timer, NULL);
static void mce_timerfunc (unsigned long data)
{
#ifdef CONFIG_SMP
if (num_online_cpus() > 1)
schedule_work (&mce_work);
#else
mce_checkregs (NULL);
#endif
mce_timer.expires = jiffies + MCE_RATE;
add_timer (&mce_timer);
}
void init_nonfatal_mce_checker()
{
if (timerset == 0) {
/* Set the timer to check for non-fatal
errors every MCE_RATE seconds */
init_timer (&mce_timer);
mce_timer.expires = jiffies + MCE_RATE;
mce_timer.data = 0;
mce_timer.function = &mce_timerfunc;
add_timer (&mce_timer);
timerset = 1;
printk(KERN_INFO "Machine check exception polling timer started.\n");
}
}
arch/i386/kernel/cpu/mcheck/p5.c 0 → 100644
View file @ 36b8c405
/*
* P5 specific Machine Check Exception Reporting
*/
#include <linux/init.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/smp.h>
#include <asm/processor.h>
#include <asm/system.h>
#include <asm/msr.h>
#include "mce.h"
/* Machine check handler for Pentium class Intel */
static void pentium_machine_check(struct pt_regs * regs, long error_code)
{
u32 loaddr, hi, lotype;
rdmsr(MSR_IA32_P5_MC_ADDR, loaddr, hi);
rdmsr(MSR_IA32_P5_MC_TYPE, lotype, hi);
printk(KERN_EMERG "CPU#%d: Machine Check Exception: 0x%8X (type 0x%8X).\n", smp_processor_id(), loaddr, lotype);
if(lotype&(1<<5))
printk(KERN_EMERG "CPU#%d: Possible thermal failure (CPU on fire ?).\n", smp_processor_id());
}
/* Set up machine check reporting for processors with Intel style MCE */
void __init intel_p5_mcheck_init(struct cpuinfo_x86 *c)
{
u32 l, h;
/*Check for MCE support */
if( !cpu_has(c, X86_FEATURE_MCE) )
return;
/* Default P5 to off as its often misconnected */
if(mce_disabled != -1)
return;
machine_check_vector = pentium_machine_check;
wmb();
/* Read registers before enabling */
rdmsr(MSR_IA32_P5_MC_ADDR, l, h);
rdmsr(MSR_IA32_P5_MC_TYPE, l, h);
printk(KERN_INFO "Intel old style machine check architecture supported.\n");
/* Enable MCE */
set_in_cr4(X86_CR4_MCE);
printk(KERN_INFO "Intel old style machine check reporting enabled on CPU#%d.\n", smp_processor_id());
}
arch/i386/kernel/cpu/mcheck/p6.c 0 → 100644
View file @ 36b8c405
/*
* P6 specific Machine Check Exception Reporting
*/
#include <linux/init.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/smp.h>
#include <asm/processor.h>
#include <asm/system.h>
#include <asm/msr.h>
#include "mce.h"
/* Machine Check Handler For PII/PIII */
static void intel_machine_check(struct pt_regs * regs, long error_code)
{
int recover=1;
u32 alow, ahigh, high, low;
u32 mcgstl, mcgsth;
int i;
rdmsr (MSR_IA32_MCG_STATUS, mcgstl, mcgsth);
if (mcgstl & (1<<0)) /* Recoverable ? */
recover=0;
printk (KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n",
smp_processor_id(), mcgsth, mcgstl);
for (i=0; i<nr_mce_banks; i++) {
rdmsr (MSR_IA32_MC0_STATUS+i*4,low, high);
if (high & (1<<31)) {
if (high & (1<<29))
recover |= 1;
if (high & (1<<25))
recover |= 2;
printk (KERN_EMERG "Bank %d: %08x%08x", i, high, low);
high &= ~(1<<31);
if (high & (1<<27)) {
rdmsr (MSR_IA32_MC0_MISC+i*4, alow, ahigh);
printk ("[%08x%08x]", ahigh, alow);
}
if (high & (1<<26)) {
rdmsr (MSR_IA32_MC0_ADDR+i*4, alow, ahigh);
printk (" at %08x%08x", ahigh, alow);
}
printk ("\n");
}
}
if (recover & 2)
panic ("CPU context corrupt");
if (recover & 1)
panic ("Unable to continue");
printk (KERN_EMERG "Attempting to continue.\n");
/*
* Do not clear the MSR_IA32_MCi_STATUS if the error is not
* recoverable/continuable.This will allow BIOS to look at the MSRs
* for errors if the OS could not log the error.
*/
for (i=0; i<nr_mce_banks; i++) {
unsigned int msr;
msr = MSR_IA32_MC0_STATUS+i*4;
rdmsr (msr,low, high);
if (high & (1<<31)) {
/* Clear it */
wrmsr (msr, 0UL, 0UL);
/* Serialize */
wmb();
}
}
mcgstl &= ~(1<<2);
wrmsr (MSR_IA32_MCG_STATUS,mcgstl, mcgsth);
}
/* Set up machine check reporting for processors with Intel style MCE */
void __init intel_p6_mcheck_init(struct cpuinfo_x86 *c)
{
u32 l, h;
int i;
/* Check for MCE support */
if (!cpu_has(c, X86_FEATURE_MCE))
return;
/* Check for PPro style MCA */
if (!cpu_has(c, X86_FEATURE_MCA))
return;
/* Ok machine check is available */
machine_check_vector = intel_machine_check;
wmb();
printk (KERN_INFO "Intel machine check architecture supported.\n");
rdmsr (MSR_IA32_MCG_CAP, l, h);
if (l & (1<<8)) /* Control register present ? */
wrmsr(MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff);
nr_mce_banks = l & 0xff;
/* Don't enable bank 0 on intel P6 cores, it goes bang quickly. */
for (i=1; i<nr_mce_banks; i++) {
wrmsr (MSR_IA32_MC0_CTL+4*i, 0xffffffff, 0xffffffff);
wrmsr (MSR_IA32_MC0_STATUS+4*i, 0x0, 0x0);
}
set_in_cr4 (X86_CR4_MCE);
printk (KERN_INFO "Intel machine check reporting enabled on CPU#%d.\n",
smp_processor_id());
}
arch/i386/kernel/cpu/mcheck/winchip.c 0 → 100644
View file @ 36b8c405
/*
* IDT Winchip specific Machine Check Exception Reporting
*/
#include <linux/init.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <asm/processor.h>
#include <asm/system.h>
#include <asm/msr.h>
#include "mce.h"
/* Machine check handler for WinChip C6 */
static void winchip_machine_check(struct pt_regs * regs, long error_code)
{
printk(KERN_EMERG "CPU0: Machine Check Exception.\n");
}
/* Set up machine check reporting on the Winchip C6 series */
void __init winchip_mcheck_init(struct cpuinfo_x86 *c)
{
u32 lo, hi;
machine_check_vector = winchip_machine_check;
wmb();
rdmsr(MSR_IDT_FCR1, lo, hi);
lo|= (1<<2); /* Enable EIERRINT (int 18 MCE) */
lo&= ~(1<<4); /* Enable MCE */
wrmsr(MSR_IDT_FCR1, lo, hi);
set_in_cr4(X86_CR4_MCE);
printk(KERN_INFO "Winchip machine check reporting enabled on CPU#0.\n");
}
arch/i386/kernel/entry.S
View file @ 36b8c405
......@@ -471,10 +471,12 @@ ENTRY(page_fault)
pushl $do_page_fault
jmp error_code
#ifdef CONFIG_X86_MCE
ENTRY(machine_check)
pushl $0
pushl $do_machine_check
jmp error_code
#endif
ENTRY(spurious_interrupt_bug)
pushl $0
......
arch/i386/kernel/i387.c
View file @ 36b8c405
......@@ -528,3 +528,40 @@ int dump_extended_fpu( struct pt_regs *regs, struct user_fxsr_struct *fpu )
return fpvalid;
}
int dump_task_fpu(struct task_struct *tsk, struct user_i387_struct *fpu)
{
int fpvalid = tsk->used_math;
if (fpvalid) {
if (tsk == current)
unlazy_fpu(tsk);
if (cpu_has_fxsr)
copy_fpu_fxsave(tsk, fpu);
else
copy_fpu_fsave(tsk, fpu);
}
return fpvalid;
}
int dump_task_extended_fpu(struct task_struct *tsk, struct user_fxsr_struct *fpu)
{
int fpvalid = tsk->used_math && cpu_has_fxsr;
if (fpvalid) {
if (tsk == current)
unlazy_fpu(tsk);
memcpy(fpu, &tsk->thread.i387.fxsave, sizeof(*fpu));
}
return fpvalid;
}
#ifdef CONFIG_SMP
void dump_smp_unlazy_fpu(void)
{
unlazy_fpu(current);
return;
}
#endif
arch/i386/kernel/process.c
View file @ 36b8c405
......@@ -19,6 +19,7 @@
#include <linux/fs.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/elfcore.h>
#include <linux/smp.h>
#include <linux/smp_lock.h>
#include <linux/stddef.h>
......@@ -374,6 +375,25 @@ void dump_thread(struct pt_regs * regs, struct user * dump)
dump->u_fpvalid = dump_fpu (regs, &dump->i387);
}
/*
* Capture the user space registers if the task is not running (in user space)
*/
int dump_task_regs(struct task_struct *tsk, elf_gregset_t *regs)
{
struct pt_regs ptregs;
ptregs = *(struct pt_regs *)
((unsigned long)tsk->thread_info+THREAD_SIZE - sizeof(ptregs));
ptregs.xcs &= 0xffff;
ptregs.xds &= 0xffff;
ptregs.xes &= 0xffff;
ptregs.xss &= 0xffff;
elf_core_copy_regs(regs, &ptregs);
return 1;
}
/*
* This special macro can be used to load a debugging register
*/
......
arch/i386/kernel/time.c
View file @ 36b8c405
......@@ -61,6 +61,7 @@
#include <asm/arch_hooks.h>
extern spinlock_t i8259A_lock;
int pit_latch_buggy; /* extern */
#include "do_timer.h"
......
arch/i386/kernel/timers/timer_tsc.c
View file @ 36b8c405
......@@ -60,6 +60,8 @@ static unsigned long get_offset_tsc(void)
static void mark_offset_tsc(void)
{
int count;
int countmp;
static int count1=0, count2=LATCH;
/*
* It is important that these two operations happen almost at
* the same time. We do the RDTSC stuff first, since it's
......@@ -83,6 +85,20 @@ static void mark_offset_tsc(void)
count |= inb(0x40) << 8;
spin_unlock(&i8253_lock);
if (pit_latch_buggy) {
/* get center value of last 3 time lutch */
if ((count2 >= count && count >= count1)
|| (count1 >= count && count >= count2)) {
count2 = count1; count1 = count;
} else if ((count1 >= count2 && count2 >= count)
|| (count >= count2 && count2 >= count1)) {
countmp = count;count = count2;
count2 = count1;count1 = countmp;
} else {
count2 = count1; count1 = count; count = count1;
}
}
count = ((LATCH-1) - count) * TICK_SIZE;
delay_at_last_interrupt = (count + LATCH/2) / LATCH;
}
......@@ -111,10 +127,12 @@ static unsigned long __init calibrate_tsc(void)
* Set the Gate high, program CTC channel 2 for mode 0,
* (interrupt on terminal count mode), binary count,
* load 5 * LATCH count, (LSB and MSB) to begin countdown.
*
* Some devices need a delay here.
*/
outb(0xb0, 0x43); /* binary, mode 0, LSB/MSB, Ch 2 */
outb(CALIBRATE_LATCH & 0xff, 0x42); /* LSB of count */
outb(CALIBRATE_LATCH >> 8, 0x42); /* MSB of count */
outb_p(CALIBRATE_LATCH & 0xff, 0x42); /* LSB of count */
outb_p(CALIBRATE_LATCH >> 8, 0x42); /* MSB of count */
{
unsigned long startlow, starthigh;
......@@ -238,8 +256,6 @@ static int init_tsc(void)
* moaned if you have the only one in the world - you fix it!
*/
dodgy_tsc();
if (cpu_has_tsc) {
unsigned long tsc_quotient = calibrate_tsc();
if (tsc_quotient) {
......
arch/i386/kernel/traps.c
View file @ 36b8c405
......@@ -906,7 +906,9 @@ void __init trap_init(void)
set_trap_gate(15,&spurious_interrupt_bug);
set_trap_gate(16,&coprocessor_error);
set_trap_gate(17,&alignment_check);
#ifdef CONFIG_X86_MCE
set_trap_gate(18,&machine_check);
#endif
set_trap_gate(19,&simd_coprocessor_error);
set_system_gate(SYSCALL_VECTOR,&system_call);
......
arch/i386/pci/common.c
View file @ 36b8c405
......@@ -90,6 +90,11 @@ static void __devinit pcibios_fixup_ghosts(struct pci_bus *b)
}
}
void __devinit
pcibios_fixup_pbus_ranges (struct pci_bus *bus, struct pbus_set_ranges_data *ranges)
{
}
/*
* Called after each bus is probed, but before its children
* are examined.
......
arch/i386/pci/fixup.c
View file @ 36b8c405
......@@ -138,7 +138,7 @@ static void __devinit pci_fixup_piix4_acpi(struct pci_dev *d)
#define VIA_8363_KL133_REVISION_ID 0x81
#define VIA_8363_KM133_REVISION_ID 0x84
static void __init pci_fixup_via_northbridge_bug(struct pci_dev *d)
static void __devinit pci_fixup_via_northbridge_bug(struct pci_dev *d)
{
u8 v;
u8 revision;
......@@ -180,7 +180,7 @@ static void __init pci_fixup_via_northbridge_bug(struct pci_dev *d)
* system to PCI bus no matter what are their window settings, so they are
* "transparent" (or subtractive decoding) from programmers point of view.
*/
static void __init pci_fixup_transparent_bridge(struct pci_dev *dev)
static void __devinit pci_fixup_transparent_bridge(struct pci_dev *dev)
{
if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI &&
(dev->device & 0xff00) == 0x2400)
......
arch/i386/vmlinux.lds.S
View file @ 36b8c405
......@@ -79,7 +79,7 @@ SECTIONS
__initcall_end = .;
. = ALIGN(4096);
__initramfs_start = .;
.init.ramfs : { *(.init.initramfs) }
.init.ramfs : { *(.init.ramfs) }
__initramfs_end = .;
. = ALIGN(32);
__per_cpu_start = .;
......
arch/ia64/kernel/process.c
View file @ 36b8c405
......@@ -383,6 +383,31 @@ copy_thread (int nr, unsigned long clone_flags,
void
do_copy_regs (struct unw_frame_info *info, void *arg)
{
do_copy_task_regs(current, info, arg);
}
void
do_dump_fpu (struct unw_frame_info *info, void *arg)
{
do_dump_task_fpu(current, info, arg);
}
void
ia64_elf_core_copy_regs (struct pt_regs *pt, elf_gregset_t dst)
{
unw_init_running(do_copy_regs, dst);
}
int
dump_fpu (struct pt_regs *pt, elf_fpregset_t dst)
{
unw_init_running(do_dump_fpu, dst);
return 1; /* f0-f31 are always valid so we always return 1 */
}
static void
do_copy_task_regs (struct task_struct *task, struct unw_frame_info *info, void *arg)
{
unsigned long mask, sp, nat_bits = 0, ip, ar_rnat, urbs_end, cfm;
elf_greg_t *dst = arg;
......@@ -398,12 +423,12 @@ do_copy_regs (struct unw_frame_info *info, void *arg)
unw_get_sp(info, &sp);
pt = (struct pt_regs *) (sp + 16);
urbs_end = ia64_get_user_rbs_end(current, pt, &cfm);
urbs_end = ia64_get_user_rbs_end(task, pt, &cfm);
if (ia64_sync_user_rbs(current, info->sw, pt->ar_bspstore, urbs_end) < 0)
if (ia64_sync_user_rbs(task, info->sw, pt->ar_bspstore, urbs_end) < 0)
return;
ia64_peek(current, info->sw, urbs_end, (long) ia64_rse_rnat_addr((long *) urbs_end),
ia64_peek(task, info->sw, urbs_end, (long) ia64_rse_rnat_addr((long *) urbs_end),
&ar_rnat);
/*
......@@ -452,7 +477,7 @@ do_copy_regs (struct unw_frame_info *info, void *arg)
}
void
do_dump_fpu (struct unw_frame_info *info, void *arg)
do_dump_task_fpu (struct task_struct *task, struct unw_frame_info *info, void *arg)
{
elf_fpreg_t *dst = arg;
int i;
......@@ -467,22 +492,41 @@ do_dump_fpu (struct unw_frame_info *info, void *arg)
for (i = 2; i < 32; ++i)
unw_get_fr(info, i, dst + i);
ia64_flush_fph(current);
if ((current->thread.flags & IA64_THREAD_FPH_VALID) != 0)
memcpy(dst + 32, current->thread.fph, 96*16);
ia64_flush_fph(task);
if ((task->thread.flags & IA64_THREAD_FPH_VALID) != 0)
memcpy(dst + 32, task->thread.fph, 96*16);
}
void
ia64_elf_core_copy_regs (struct pt_regs *pt, elf_gregset_t dst)
int dump_task_regs(struct task_struct *task, elf_gregset_t *regs)
{
unw_init_running(do_copy_regs, dst);
struct unw_frame_info tcore_info;
if(current == task) {
unw_init_running(do_copy_regs, regs);
}
else {
memset(&tcore_info, 0, sizeof(tcore_info));
unw_init_from_blocked_task(&tcore_info, task);
do_copy_task_regs(task, &tcore_info, regs);
}
return 1;
}
int
dump_fpu (struct pt_regs *pt, elf_fpregset_t dst)
int dump_task_fpu (struct task_struct *task, elf_fpregset_t *dst)
{
unw_init_running(do_dump_fpu, dst);
return 1; /* f0-f31 are always valid so we always return 1 */
struct unw_frame_info tcore_info;
if(current == task) {
unw_init_running(do_dump_fpu, dst);
}
else {
memset(&tcore_info, 0, sizeof(tcore_info));
unw_init_from_blocked_task(&tcore_info, task);
do_dump_task_fpu(task, &tcore_info, dst);
}
return 1;
}
asmlinkage long
......
arch/ia64/sn/kernel/irq.c
View file @ 36b8c405
......@@ -294,7 +294,7 @@ irq_to_bit_pos(int irq) {
#ifdef ajmtestintr
#include <linux/timer.h>
struct timer_list intr_test_timer;
struct timer_list intr_test_timer = TIMER_INITIALIZER(NULL, 0, 0);
int intr_test_icount[NR_IRQS];
struct intr_test_reg_struct {
pcibr_soft_t pcibr_soft;
......
arch/ia64/sn/kernel/mca.c
View file @ 36b8c405
......@@ -238,7 +238,7 @@ sn_cpei_handler(int irq, void *devid, struct pt_regs *regs) {
#include <linux/timer.h>
#define CPEI_INTERVAL (HZ/100)
struct timer_list sn_cpei_timer;
struct timer_list sn_cpei_timer = TIMER_INITIALIZER(NULL, 0, 0);
void sn_init_cpei_timer(void);
void
......
arch/m68k/amiga/amisound.c
View file @ 36b8c405
......@@ -62,7 +62,7 @@ void __init amiga_init_sound(void)
}
static void nosound( unsigned long ignored );
static struct timer_list sound_timer = { function: nosound };
static struct timer_list sound_timer = TIMER_INITIALIZER(nosound, 0, 0);
void amiga_mksound( unsigned int hz, unsigned int ticks )
{
......
arch/m68k/mac/macboing.c
View file @ 36b8c405
......@@ -56,7 +56,8 @@ static void ( *mac_special_bell )( unsigned int, unsigned int, unsigned int ) =
/*
* our timer to start/continue/stop the bell
*/
static struct timer_list mac_sound_timer = { function: mac_nosound };
static struct timer_list mac_sound_timer =
TIMER_INITIALIZER(mac_nosound, 0, 0);
/*
* Sort of initialize the sound chip (called from mac_mksound on the first
......
arch/mips/ddb5074/pci.c
View file @ 36b8c405
......@@ -297,8 +297,8 @@ void __init pcibios_update_irq(struct pci_dev *dev, int irq)
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
}
void __init pcibios_fixup_pbus_ranges(struct pci_bus *bus,
struct pbus_set_ranges_data *ranges)
void __devinit pcibios_fixup_pbus_ranges(struct pci_bus *bus,
struct pbus_set_ranges_data *ranges)
{
}
......
arch/mips/ddb5476/pci.c
View file @ 36b8c405
......@@ -341,8 +341,8 @@ void __init pcibios_update_irq(struct pci_dev *dev, int irq)
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
}
void __init pcibios_fixup_pbus_ranges(struct pci_bus *bus,
struct pbus_set_ranges_data *ranges)
void __devinit pcibios_fixup_pbus_ranges(struct pci_bus *bus,
struct pbus_set_ranges_data *ranges)
{
/*
* our caller figure out range by going through the dev structures.
......
arch/mips64/sgi-ip27/ip27-pci.c
View file @ 36b8c405
......@@ -234,7 +234,7 @@ pcibios_fixup_bus(struct pci_bus *b)
pci_fixup_irqs(pci_swizzle, pci_map_irq);
}
void __init
void __devinit
pcibios_fixup_pbus_ranges(struct pci_bus * bus,
struct pbus_set_ranges_data * ranges)
{
......
arch/mips64/sgi-ip32/ip32-pci.c
View file @ 36b8c405
......@@ -349,8 +349,8 @@ void __init pcibios_fixup_bus (struct pci_bus *b)
}
/* XXX anybody know what this is supposed to do? */
void __init pcibios_fixup_pbus_ranges(struct pci_bus * bus,
struct pbus_set_ranges_data * ranges)
void __devinit pcibios_fixup_pbus_ranges(struct pci_bus * bus,
struct pbus_set_ranges_data * ranges)
{
}
......
arch/parisc/kernel/pci.c
View file @ 36b8c405
......@@ -345,7 +345,7 @@ pcibios_link_hba_resources( struct resource *hba_res, struct resource *r)
/*
** called by drivers/pci/setup-res.c:pci_setup_bridge().
*/
void pcibios_fixup_pbus_ranges(
void __devinit pcibios_fixup_pbus_ranges(
struct pci_bus *bus,
struct pbus_set_ranges_data *ranges
)
......
arch/ppc/8xx_io/cs4218_tdm.c
View file @ 36b8c405
......@@ -1375,8 +1375,7 @@ static void cs_nosound(unsigned long xx)
restore_flags(flags);
}
static struct timer_list beep_timer = {
.function = cs_nosound
static struct timer_list beep_timer = TIMER_INITIALIZER(cs_nosound, 0, 0);
};
static void cs_mksound(unsigned int hz, unsigned int ticks)
......
arch/ppc/kernel/pci.c
View file @ 36b8c405
......@@ -1107,7 +1107,7 @@ common_swizzle(struct pci_dev *dev, unsigned char *pinp)
return PCI_SLOT(dev->devfn);
}
void __init
void __devinit
pcibios_fixup_pbus_ranges(struct pci_bus * bus, struct pbus_set_ranges_data * ranges)
{
}
......
arch/ppc64/kernel/pci.c
View file @ 36b8c405
......@@ -121,8 +121,8 @@ static void fixup_windbond_82c105(struct pci_dev* dev)
}
void pcibios_fixup_pbus_ranges(struct pci_bus *pbus,
struct pbus_set_ranges_data *pranges)
void __devinit pcibios_fixup_pbus_ranges(struct pci_bus *pbus,
struct pbus_set_ranges_data *pranges)
{
}
......
arch/sh/kernel/pci-dc.c
View file @ 36b8c405
......@@ -113,7 +113,7 @@ void pci_free_consistent(struct pci_dev *hwdev, size_t size,
}
void __init pcibios_fixup_pbus_ranges(struct pci_bus *bus, struct pbus_set_ranges_data *ranges)
void __devinit pcibios_fixup_pbus_ranges(struct pci_bus *bus, struct pbus_set_ranges_data *ranges)
{
}
......
arch/sh/kernel/pci-sh7751.c
View file @ 36b8c405
......@@ -250,8 +250,8 @@ struct pci_fixup pcibios_fixups[] = {
{ 0 }
};
void __init pcibios_fixup_pbus_ranges(struct pci_bus *b,
struct pbus_set_ranges_data *range)
void __devinit pcibios_fixup_pbus_ranges(struct pci_bus *b,
struct pbus_set_ranges_data *range)
{
/* No fixups needed */
}
......
arch/sh/kernel/pci_st40.c
View file @ 36b8c405
......@@ -380,7 +380,7 @@ static int __init map_harp_irq(struct pci_dev *dev, u8 slot, u8 pin)
}
void __init
void __devinit
pcibios_fixup_pbus_ranges(struct pci_bus *bus,
struct pbus_set_ranges_data *ranges)
{
......
arch/sparc/Makefile
View file @ 36b8c405
......@@ -21,6 +21,7 @@ NEW_GAS := $(shell if $(LD) --version 2>&1 | grep 'elf64_sparc' > /dev/null; the
ifeq ($(NEW_GAS),y)
AS := $(AS) -32
LDFLAGS := -m elf32_sparc
LDFLAGS_BLOB := --format binary --oformat elf32-sparc
endif
#CFLAGS := $(CFLAGS) -g -pipe -fcall-used-g5 -fcall-used-g7
......@@ -41,13 +42,20 @@ core-y += arch/sparc/kernel/ arch/sparc/mm/ arch/sparc/math-emu/
libs-y += arch/sparc/prom/ arch/sparc/lib/
# Export what is needed by arch/sparc/boot/Makefile
export init-y core-y drivers-y net-y libs-y HEAD
# Renaming is done to avoid confusing pattern matching rules in 2.5.45 (multy-)
INIT_Y := $(patsubst %/, %/built-in.o, $(init-y))
CORE_Y := $(core-y)
CORE_Y += kernel/ mm/ fs/ ipc/ security/ crypto/
CORE_Y := $(patsubst %/, %/built-in.o, $(CORE_Y))
DRIVERS_Y := $(patsubst %/, %/built-in.o, $(drivers-y))
NET_Y := $(patsubst %/, %/built-in.o, $(net-y))
LIBS_Y := $(patsubst %/, %/lib.a, $(libs-y))
export INIT_Y CORE_Y DRIVERS_Y NET_Y LIBS_Y HEAD
image: vmlinux
$(MAKE) -C arch/sparc/boot image
archclean:
rm -f arch/sparc/kernel/include
rm -f $(TOPDIR)/vmlinux.aout
-$(MAKE) -C arch/sparc/boot clean
......
arch/sparc/boot/Makefile
View file @ 36b8c405
......@@ -22,8 +22,8 @@ btfixupprep: btfixupprep.c
clean:
rm -f btfixupprep piggyback tftpboot.img btfix.o btfix.s image
BTOBJS := $(HEAD) $(init-y)
BTLIBS := $(core-y) $(libs-y) $(drivers-y) $(net-y)
BTOBJS := $(HEAD) $(INIT_Y)
BTLIBS := $(CORE_Y) $(LIBS_Y) $(DRIVERS_Y) $(NET_Y)
# Actual linking
image: btfix.o
......
arch/sparc/kernel/ioport.c
View file @ 36b8c405
......@@ -514,7 +514,7 @@ void *pci_alloc_consistent(struct pci_dev *pdev, size_t len, dma_addr_t *pba)
mmu_inval_dma_area(va, len_total);
#if 1
#if 0
/* P3 */ printk("pci_alloc_consistent: kva %lx uncva %lx phys %lx size %x\n",
(long)va, (long)res->start, (long)virt_to_phys(va), len_total);
#endif
......
arch/sparc/kernel/sys_sparc.c
View file @ 36b8c405
......@@ -269,6 +269,21 @@ asmlinkage unsigned long sys_mmap(unsigned long addr, unsigned long len,
return do_mmap2(addr, len, prot, flags, fd, off >> PAGE_SHIFT);
}
extern int sys_remap_file_pages(unsigned long start, unsigned long size,
unsigned long prot, unsigned long pgoff,
unsigned long flags);
int sparc_remap_file_pages(unsigned long start, unsigned long size,
unsigned long prot, unsigned long pgoff,
unsigned long flags)
{
/* This works on an existing mmap so we don't need to validate
* the range as that was done at the original mmap call.
*/
return sys_remap_file_pages(start, size, prot,
(pgoff >> (PAGE_SHIFT - 12)), flags);
}
extern unsigned long do_mremap(unsigned long addr,
unsigned long old_len, unsigned long new_len,
unsigned long flags, unsigned long new_addr);
......
arch/sparc/kernel/systbls.S
View file @ 36b8c405
......@@ -56,7 +56,7 @@ sys_call_table:
/*175*/ .long sys_setsid, sys_fchdir, sys_fgetxattr, sys_listxattr, sys_llistxattr
/*180*/ .long sys_flistxattr, sys_removexattr, sys_lremovexattr, sys_sigpending, sys_query_module
/*185*/ .long sys_setpgid, sys_fremovexattr, sys_tkill, sys_exit_group, sys_newuname
/*190*/ .long sys_init_module, sys_personality, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall
/*190*/ .long sys_init_module, sys_personality, sparc_remap_file_pages, sys_nis_syscall, sys_nis_syscall
/*195*/ .long sys_nis_syscall, sys_nis_syscall, sys_getppid, sparc_sigaction, sys_sgetmask
/*200*/ .long sys_ssetmask, sys_sigsuspend, sys_newlstat, sys_uselib, old_readdir
/*205*/ .long sys_readahead, sys_socketcall, sys_syslog, sys_lookup_dcookie, sys_nis_syscall
......
arch/sparc/mm/sun4c.c
View file @ 36b8c405
......@@ -292,7 +292,7 @@ void __init sun4c_probe_vac(void)
switch (idprom->id_machtype) {
case (SM_SUN4|SM_4_110):
sun4c_vacinfo.type = NONE;
sun4c_vacinfo.type = VAC_NONE;
sun4c_vacinfo.num_bytes = 0;
sun4c_vacinfo.linesize = 0;
sun4c_vacinfo.do_hwflushes = 0;
......@@ -301,21 +301,21 @@ void __init sun4c_probe_vac(void)
break;
case (SM_SUN4|SM_4_260):
sun4c_vacinfo.type = WRITE_BACK;
sun4c_vacinfo.type = VAC_WRITE_BACK;
sun4c_vacinfo.num_bytes = 128 * 1024;
sun4c_vacinfo.linesize = 16;
sun4c_vacinfo.do_hwflushes = 0;
break;
case (SM_SUN4|SM_4_330):
sun4c_vacinfo.type = WRITE_THROUGH;
sun4c_vacinfo.type = VAC_WRITE_THROUGH;
sun4c_vacinfo.num_bytes = 128 * 1024;
sun4c_vacinfo.linesize = 16;
sun4c_vacinfo.do_hwflushes = 0;
break;
case (SM_SUN4|SM_4_470):
sun4c_vacinfo.type = WRITE_BACK;
sun4c_vacinfo.type = VAC_WRITE_BACK;
sun4c_vacinfo.num_bytes = 128 * 1024;
sun4c_vacinfo.linesize = 32;
sun4c_vacinfo.do_hwflushes = 0;
......@@ -326,7 +326,7 @@ void __init sun4c_probe_vac(void)
prom_halt();
};
} else {
sun4c_vacinfo.type = WRITE_THROUGH;
sun4c_vacinfo.type = VAC_WRITE_THROUGH;
if ((idprom->id_machtype == (SM_SUN4C | SM_4C_SS1)) ||
(idprom->id_machtype == (SM_SUN4C | SM_4C_SS1PLUS))) {
......
arch/sparc/vmlinux.lds.S
View file @ 36b8c405
......@@ -56,6 +56,10 @@ SECTIONS
*(.initcall7.init)
}
__initcall_end = .;
. = ALIGN(4096);
__initramfs_start = .;
.init.ramfs : { *(.init.ramfs) }
__initramfs_end = .;
. = ALIGN(32);
__per_cpu_start = .;
.data.percpu : { *(.data.percpu) }
......
arch/sparc64/Makefile
View file @ 36b8c405
......@@ -31,6 +31,7 @@ RANLIB = sparc64-linux-ranlib
else
AS := $(AS) -64
LDFLAGS := -m elf64_sparc
LDFLAGS_BLOB := --format binary --oformat elf64-sparc
endif
ELFTOAOUT = elftoaout
ifneq ($(UNDECLARED_REGS),y)
......
arch/sparc64/kernel/ioctl32.c
View file @ 36b8c405
......@@ -55,6 +55,7 @@
#if defined(CONFIG_BLK_DEV_LVM) || defined(CONFIG_BLK_DEV_LVM_MODULE)
#include <linux/lvm.h>
#endif /* LVM */
#include <linux/dm-ioctl.h>
#include <scsi/scsi.h>
/* Ugly hack. */
......@@ -5012,6 +5013,19 @@ COMPATIBLE_IOCTL(NBD_CLEAR_QUE)
COMPATIBLE_IOCTL(NBD_PRINT_DEBUG)
COMPATIBLE_IOCTL(NBD_SET_SIZE_BLOCKS)
COMPATIBLE_IOCTL(NBD_DISCONNECT)
/* device-mapper */
COMPATIBLE_IOCTL(DM_VERSION)
COMPATIBLE_IOCTL(DM_REMOVE_ALL)
COMPATIBLE_IOCTL(DM_DEV_CREATE)
COMPATIBLE_IOCTL(DM_DEV_REMOVE)
COMPATIBLE_IOCTL(DM_DEV_RELOAD)
COMPATIBLE_IOCTL(DM_DEV_SUSPEND)
COMPATIBLE_IOCTL(DM_DEV_RENAME)
COMPATIBLE_IOCTL(DM_DEV_DEPS)
COMPATIBLE_IOCTL(DM_DEV_STATUS)
COMPATIBLE_IOCTL(DM_TARGET_STATUS)
COMPATIBLE_IOCTL(DM_TARGET_WAIT)
/* And these ioctls need translation */
HANDLE_IOCTL(MEMREADOOB32, mtd_rw_oob)
HANDLE_IOCTL(MEMWRITEOOB32, mtd_rw_oob)
......
arch/sparc64/kernel/pci.c
View file @ 36b8c405
......@@ -479,8 +479,8 @@ void pcibios_update_irq(struct pci_dev *pdev, int irq)
{
}
void pcibios_fixup_pbus_ranges(struct pci_bus *pbus,
struct pbus_set_ranges_data *pranges)
void __devinit pcibios_fixup_pbus_ranges(struct pci_bus *pbus,
struct pbus_set_ranges_data *pranges)
{
}
......
arch/sparc64/kernel/sys32.S
View file @ 36b8c405
......@@ -42,7 +42,7 @@ sys32_mknod:
and %o2, %g2, %o2
.align 32
.globl sys32_sendto, sys32_recvfrom, sys32_getsockopt
.globl sys32_sendto, sys32_recvfrom
sys32_sendto:
sethi %hi(sys_sendto), %g1
jmpl %g1 + %lo(sys_sendto), %g0
......@@ -52,10 +52,6 @@ sys32_recvfrom:
sethi %hi(sys_recvfrom), %g1
jmpl %g1 + %lo(sys_recvfrom), %g0
srl %o5, 0, %o5
sys32_getsockopt:
sethi %hi(sys_getsockopt), %g1
jmpl %g1 + %lo(sys_getsockopt), %g0
srl %o4, 0, %o4
.globl sys32_bdflush
sys32_bdflush:
......
arch/sparc64/kernel/sys_sparc32.c
View file @ 36b8c405
......@@ -2731,12 +2731,34 @@ static int do_set_icmpv6_filter(int fd, int level, int optname,
return ret;
}
static int do_set_sock_timeout(int fd, int level, int optname, char *optval, int optlen)
{
struct timeval32 *up = (struct timeval32 *) optval;
struct timeval ktime;
mm_segment_t old_fs;
int err;
if (optlen < sizeof(*up))
return -EINVAL;
if (get_user(ktime.tv_sec, &up->tv_sec) ||
__get_user(ktime.tv_usec, &up->tv_usec))
return -EFAULT;
old_fs = get_fs();
set_fs(KERNEL_DS);
err = sys_setsockopt(fd, level, optname, (char *) &ktime, sizeof(ktime));
set_fs(old_fs);
return err;
}
asmlinkage int sys32_setsockopt(int fd, int level, int optname,
char *optval, int optlen)
{
if (optname == SO_ATTACH_FILTER)
return do_set_attach_filter(fd, level, optname,
optval, optlen);
if (optname == SO_RCVTIMEO || optname == SO_SNDTIMEO)
return do_set_sock_timeout(fd, level, optname, optval, optlen);
if (level == SOL_ICMPV6 && optname == ICMPV6_FILTER)
return do_set_icmpv6_filter(fd, level, optname,
optval, optlen);
......@@ -2744,6 +2766,43 @@ asmlinkage int sys32_setsockopt(int fd, int level, int optname,
return sys_setsockopt(fd, level, optname, optval, optlen);
}
extern asmlinkage long sys_getsockopt(int fd, int level, int optname,
char *optval, int *optlen);
static int do_get_sock_timeout(int fd, int level, int optname, char *optval, int *optlen)
{
struct timeval32 *up = (struct timeval32 *) optval;
struct timeval ktime;
mm_segment_t old_fs;
int len, err;
if (get_user(len, optlen))
return -EFAULT;
if (len < sizeof(*up))
return -EINVAL;
len = sizeof(ktime);
old_fs = get_fs();
set_fs(KERNEL_DS);
err = sys_getsockopt(fd, level, optname, (char *) &ktime, &len);
set_fs(old_fs);
if (!err) {
if (put_user(sizeof(*up), optlen) ||
put_user(ktime.tv_sec, &up->tv_sec) ||
__put_user(ktime.tv_usec, &up->tv_usec))
err = -EFAULT;
}
return err;
}
asmlinkage int sys32_getsockopt(int fd, int level, int optname,
char *optval, int *optlen)
{
if (optname == SO_RCVTIMEO || optname == SO_SNDTIMEO)
return do_get_sock_timeout(fd, level, optname, optval, optlen);
return sys_getsockopt(fd, level, optname, optval, optlen);
}
extern void check_pending(int signum);
asmlinkage int sys32_sigaction (int sig, struct old_sigaction32 *act, struct old_sigaction32 *oact)
......
arch/sparc64/kernel/systbls.S
View file @ 36b8c405
......@@ -57,7 +57,7 @@ sys_call_table32:
.word sys_setsid, sys_fchdir, sys_fgetxattr, sys_listxattr, sys_llistxattr
/*180*/ .word sys_flistxattr, sys_removexattr, sys_lremovexattr, sys32_sigpending, sys32_query_module
.word sys_setpgid, sys_fremovexattr, sys_tkill, sys_exit_group, sparc64_newuname
/*190*/ .word sys32_init_module, sparc64_personality, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall
/*190*/ .word sys32_init_module, sparc64_personality, sys_remap_file_pages, sys_nis_syscall, sys_nis_syscall
.word sys_nis_syscall, sys_nis_syscall, sys_getppid, sys32_sigaction, sys_sgetmask
/*200*/ .word sys_ssetmask, sys_sigsuspend, sys32_newlstat, sys_uselib, old32_readdir
.word sys32_readahead, sys32_socketcall, sys_syslog, sys_lookup_dcookie, sys_nis_syscall
......@@ -116,7 +116,7 @@ sys_call_table:
.word sys_setsid, sys_fchdir, sys_fgetxattr, sys_listxattr, sys_llistxattr
/*180*/ .word sys_flistxattr, sys_removexattr, sys_lremovexattr, sys_nis_syscall, sys_query_module
.word sys_setpgid, sys_fremovexattr, sys_tkill, sys_exit_group, sparc64_newuname
/*190*/ .word sys_init_module, sparc64_personality, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall
/*190*/ .word sys_init_module, sparc64_personality, sys_remap_file_pages, sys_nis_syscall, sys_nis_syscall
.word sys_nis_syscall, sys_nis_syscall, sys_getppid, sys_nis_syscall, sys_sgetmask
/*200*/ .word sys_ssetmask, sys_nis_syscall, sys_newlstat, sys_uselib, sys_nis_syscall
.word sys_readahead, sys_socketcall, sys_syslog, sys_lookup_dcookie, sys_nis_syscall
......
arch/sparc64/kernel/traps.c
View file @ 36b8c405
......@@ -1524,6 +1524,8 @@ void do_div0(struct pt_regs *regs)
{
siginfo_t info;
if (regs->tstate & TSTATE_PRIV)
die_if_kernel("TL0: Kernel divide by zero.", regs);
if (test_thread_flag(TIF_32BIT)) {
regs->tpc &= 0xffffffff;
regs->tnpc &= 0xffffffff;
......
arch/sparc64/vmlinux.lds.S
View file @ 36b8c405
......@@ -57,6 +57,10 @@ SECTIONS
*(.initcall7.init)
}
__initcall_end = .;
. = ALIGN(8192);
__initramfs_start = .;
.init.ramfs : { *(.init.ramfs) }
__initramfs_end = .;
. = ALIGN(32);
__per_cpu_start = .;
.data.percpu : { *(.data.percpu) }
......
crypto/Kconfig
View file @ 36b8c405
......@@ -9,24 +9,30 @@ config CRYPTO
help
This option provides the core Cryptographic API.
config CRYPTO_HMAC
bool "HMAC support"
depends on CRYPTO
help
HMAC: Keyed-Hashing for Message Authentication (RFC2104).
This is required for IPSec.
config CRYPTO_MD4
tristate "MD4 digest algorithm"
depends on CRYPTO
help
MD4 message digest algorithm (RFC1320), including HMAC (RFC2104).
MD4 message digest algorithm (RFC1320).
config CRYPTO_MD5
tristate "MD5 digest algorithm"
depends on CRYPTO
help
MD5 message digest algorithm (RFC1321), including HMAC (RFC2104, RFC2403).
MD5 message digest algorithm (RFC1321).
config CRYPTO_SHA1
tristate "SHA-1 digest algorithm"
depends on CRYPTO
help
SHA-1 secure hash standard (FIPS 180-1), including HMAC (RFC2104, RFC2404).
SHA-1 secure hash standard (FIPS 180-1).
config CRYPTO_DES
tristate "DES and Triple DES EDE cipher algorithms"
......
crypto/Makefile
View file @ 36b8c405
......@@ -2,11 +2,13 @@
# Cryptographic API
#
export-objs := api.o
export-objs := api.o hmac.o
obj-$(CONFIG_CRYPTO) += api.o cipher.o digest.o compress.o
obj-$(CONFIG_KMOD) += autoload.o
autoload-crypto-$(CONFIG_KMOD) = autoload.o
obj-$(CONFIG_CRYPTO) += api.o cipher.o digest.o compress.o $(autoload-crypto-y)
obj-$(CONFIG_CRYPTO_HMAC) += hmac.o
obj-$(CONFIG_CRYPTO_MD4) += md4.o
obj-$(CONFIG_CRYPTO_MD5) += md5.o
obj-$(CONFIG_CRYPTO_SHA1) += sha1.o
......
crypto/api.c
View file @ 36b8c405
......@@ -67,9 +67,10 @@ static int crypto_init_flags(struct crypto_tfm *tfm, u32 flags)
return crypto_init_compress_flags(tfm, flags);
default:
BUG();
break;
}
BUG();
return -EINVAL;
}
......@@ -99,13 +100,7 @@ struct crypto_tfm *crypto_alloc_tfm(const char *name, u32 flags)
struct crypto_tfm *tfm = NULL;
struct crypto_alg *alg;
alg = crypto_alg_lookup(name);
#ifdef CONFIG_KMOD
if (alg == NULL) {
crypto_alg_autoload(name);
alg = crypto_alg_lookup(name);
}
#endif
alg = crypto_alg_mod_lookup(name);
if (alg == NULL)
goto out;
......@@ -113,6 +108,8 @@ struct crypto_tfm *crypto_alloc_tfm(const char *name, u32 flags)
if (tfm == NULL)
goto out_put;
memset(tfm, 0, sizeof(*tfm));
if (alg->cra_ctxsize) {
tfm->crt_ctx = kmalloc(alg->cra_ctxsize, GFP_KERNEL);
if (tfm->crt_ctx == NULL)
......@@ -121,13 +118,24 @@ struct crypto_tfm *crypto_alloc_tfm(const char *name, u32 flags)
tfm->__crt_alg = alg;
if (alg->cra_blocksize) {
tfm->crt_work_block = kmalloc(alg->cra_blocksize + 1,
GFP_KERNEL);
if (tfm->crt_work_block == NULL)
goto out_free_ctx;
}
if (crypto_init_flags(tfm, flags))
goto out_free_ctx;
goto out_free_work_block;
crypto_init_ops(tfm);
goto out;
out_free_work_block:
if (tfm->__crt_alg->cra_blocksize)
kfree(tfm->crt_work_block);
out_free_ctx:
if (tfm->__crt_alg->cra_ctxsize)
kfree(tfm->crt_ctx);
......@@ -145,6 +153,9 @@ void crypto_free_tfm(struct crypto_tfm *tfm)
if (tfm->__crt_alg->cra_ctxsize)
kfree(tfm->crt_ctx);
if (tfm->__crt_alg->cra_blocksize)
kfree(tfm->crt_work_block);
if (crypto_tfm_alg_type(tfm) == CRYPTO_ALG_TYPE_CIPHER)
if (tfm->crt_cipher.cit_iv)
kfree(tfm->crt_cipher.cit_iv);
......@@ -207,6 +218,19 @@ int crypto_unregister_alg(struct crypto_alg *alg)
return ret;
}
int crypto_alg_available(const char *name, u32 flags)
{
int ret = 0;
struct crypto_alg *alg = crypto_alg_mod_lookup(name);
if (alg) {
crypto_alg_put(alg);
ret = 1;
}
return ret;
}
static void *c_start(struct seq_file *m, loff_t *pos)
{
struct list_head *v;
......@@ -296,3 +320,4 @@ EXPORT_SYMBOL_GPL(crypto_register_alg);
EXPORT_SYMBOL_GPL(crypto_unregister_alg);
EXPORT_SYMBOL_GPL(crypto_alloc_tfm);
EXPORT_SYMBOL_GPL(crypto_free_tfm);
EXPORT_SYMBOL_GPL(crypto_alg_available);
crypto/autoload.c
View file @ 36b8c405
......@@ -25,3 +25,13 @@ void crypto_alg_autoload(const char *name)
{
request_module(name);
}
struct crypto_alg *crypto_alg_mod_lookup(const char *name)
{
struct crypto_alg *alg = crypto_alg_lookup(name);
if (alg == NULL) {
crypto_alg_autoload(name);
alg = crypto_alg_lookup(name);
}
return alg;
}
crypto/digest.c
View file @ 36b8c405
......@@ -5,9 +5,6 @@
*
* Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
*
* The HMAC implementation is derived from USAGI.
* Copyright (c) 2002 Kazunori Miyazawa <miyazawa@linux-ipv6.org> / USAGI
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
......@@ -61,56 +58,6 @@ static void digest(struct crypto_tfm *tfm,
crypto_digest_final(tfm, out);
}
static void hmac(struct crypto_tfm *tfm, u8 *key, unsigned int keylen,
struct scatterlist *sg, unsigned int nsg, u8 *out)
{
unsigned int i;
struct scatterlist tmp;
char ipad[crypto_tfm_alg_blocksize(tfm) + 1];
char opad[crypto_tfm_alg_blocksize(tfm) + 1];
if (keylen > crypto_tfm_alg_blocksize(tfm)) {
tmp.page = virt_to_page(key);
tmp.offset = ((long)key & ~PAGE_MASK);
tmp.length = keylen;
crypto_digest_digest(tfm, &tmp, 1, key);
keylen = crypto_tfm_alg_digestsize(tfm);
}
memset(ipad, 0, sizeof(ipad));
memset(opad, 0, sizeof(opad));
memcpy(ipad, key, keylen);
memcpy(opad, key, keylen);
for (i = 0; i < crypto_tfm_alg_blocksize(tfm); i++) {
ipad[i] ^= 0x36;
opad[i] ^= 0x5c;
}
tmp.page = virt_to_page(ipad);
tmp.offset = ((long)ipad & ~PAGE_MASK);
tmp.length = crypto_tfm_alg_blocksize(tfm);
crypto_digest_init(tfm);
crypto_digest_update(tfm, &tmp, 1);
crypto_digest_update(tfm, sg, nsg);
crypto_digest_final(tfm, out);
tmp.page = virt_to_page(opad);
tmp.offset = ((long)opad & ~PAGE_MASK);
tmp.length = crypto_tfm_alg_blocksize(tfm);
crypto_digest_init(tfm);
crypto_digest_update(tfm, &tmp, 1);
tmp.page = virt_to_page(out);
tmp.offset = ((long)out & ~PAGE_MASK);
tmp.length = crypto_tfm_alg_digestsize(tfm);
crypto_digest_update(tfm, &tmp, 1);
crypto_digest_final(tfm, out);
}
int crypto_init_digest_flags(struct crypto_tfm *tfm, u32 flags)
{
return crypto_cipher_flags(flags) ? -EINVAL : 0;
......@@ -120,9 +67,8 @@ void crypto_init_digest_ops(struct crypto_tfm *tfm)
{
struct digest_tfm *ops = &tfm->crt_digest;
ops->dit_init = init;
ops->dit_update = update;
ops->dit_final = final;
ops->dit_digest = digest;
ops->dit_hmac = hmac;
ops->dit_init = init;
ops->dit_update = update;
ops->dit_final = final;
ops->dit_digest = digest;
}
crypto/hmac.c 0 → 100644
View file @ 36b8c405
/*
* Cryptographic API.
*
* HMAC: Keyed-Hashing for Message Authentication (RFC2104).
*
* Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
*
* The HMAC implementation is derived from USAGI.
* Copyright (c) 2002 Kazunori Miyazawa <miyazawa@linux-ipv6.org> / USAGI
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
* any later version.
*
*/
#include <linux/crypto.h>
#include <linux/mm.h>
#include <linux/highmem.h>
#include <asm/scatterlist.h>
#include "internal.h"
static void hash_key(struct crypto_tfm *tfm, u8 *key, unsigned int keylen)
{
struct scatterlist tmp;
tmp.page = virt_to_page(key);
tmp.offset = ((long)key & ~PAGE_MASK);
tmp.length = keylen;
crypto_digest_digest(tfm, &tmp, 1, key);
}
void crypto_hmac_init(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen)
{
unsigned int i;
struct scatterlist tmp;
char *ipad = tfm->crt_work_block;
if (*keylen > crypto_tfm_alg_blocksize(tfm)) {
hash_key(tfm, key, *keylen);
*keylen = crypto_tfm_alg_digestsize(tfm);
}
memset(ipad, 0, crypto_tfm_alg_blocksize(tfm) + 1);
memcpy(ipad, key, *keylen);
for (i = 0; i < crypto_tfm_alg_blocksize(tfm); i++)
ipad[i] ^= 0x36;
tmp.page = virt_to_page(ipad);
tmp.offset = ((long)ipad & ~PAGE_MASK);
tmp.length = crypto_tfm_alg_blocksize(tfm);
crypto_digest_init(tfm);
crypto_digest_update(tfm, &tmp, 1);
}
void crypto_hmac_update(struct crypto_tfm *tfm,
struct scatterlist *sg, unsigned int nsg)
{
crypto_digest_update(tfm, sg, nsg);
}
void crypto_hmac_final(struct crypto_tfm *tfm, u8 *key,
unsigned int *keylen, u8 *out)
{
unsigned int i;
struct scatterlist tmp;
char *opad = tfm->crt_work_block;
if (*keylen > crypto_tfm_alg_blocksize(tfm)) {
hash_key(tfm, key, *keylen);
*keylen = crypto_tfm_alg_digestsize(tfm);
}
crypto_digest_final(tfm, out);
memset(opad, 0, crypto_tfm_alg_blocksize(tfm) + 1);
memcpy(opad, key, *keylen);
for (i = 0; i < crypto_tfm_alg_blocksize(tfm); i++)
opad[i] ^= 0x5c;
tmp.page = virt_to_page(opad);
tmp.offset = ((long)opad & ~PAGE_MASK);
tmp.length = crypto_tfm_alg_blocksize(tfm);
crypto_digest_init(tfm);
crypto_digest_update(tfm, &tmp, 1);
tmp.page = virt_to_page(out);
tmp.offset = ((long)out & ~PAGE_MASK);
tmp.length = crypto_tfm_alg_digestsize(tfm);
crypto_digest_update(tfm, &tmp, 1);
crypto_digest_final(tfm, out);
}
void crypto_hmac(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen,
struct scatterlist *sg, unsigned int nsg, u8 *out)
{
crypto_hmac_init(tfm, key, keylen);
crypto_hmac_update(tfm, sg, nsg);
crypto_hmac_final(tfm, key, keylen, out);
}
EXPORT_SYMBOL_GPL(crypto_hmac_init);
EXPORT_SYMBOL_GPL(crypto_hmac_update);
EXPORT_SYMBOL_GPL(crypto_hmac_final);
EXPORT_SYMBOL_GPL(crypto_hmac);
crypto/internal.h
View file @ 36b8c405
......@@ -35,13 +35,21 @@ static inline void crypto_yield(struct crypto_tfm *tfm)
cond_resched();
}
static inline int crypto_cipher_flags(u32 flags)
static inline u32 crypto_cipher_flags(u32 flags)
{
return flags & (CRYPTO_TFM_MODE_MASK|CRYPTO_TFM_REQ_WEAK_KEY);
}
struct crypto_alg *crypto_alg_lookup(const char *name);
#ifdef CONFIG_KMOD
void crypto_alg_autoload(const char *name);
struct crypto_alg *crypto_alg_mod_lookup(const char *name);
#else
static inline struct crypto_alg *crypto_alg_mod_lookup(const char *name)
{
return crypto_alg_lookup(name);
}
#endif
int crypto_init_digest_flags(struct crypto_tfm *tfm, u32 flags);
......
crypto/tcrypt.c
View file @ 36b8c405
......@@ -46,6 +46,8 @@ static int mode = 0;
static char *xbuf;
static char *tvmem;
static char *check[] = { "des", "md5", "des3_ede", "rot13", "sha1", NULL };
static void
hexdump(unsigned char *buf, unsigned int len)
{
......@@ -64,7 +66,6 @@ test_md5(void)
char result[128];
struct crypto_tfm *tfm;
struct md5_testvec *md5_tv;
struct hmac_md5_testvec *hmac_md5_tv;
unsigned int tsize;
printk("\ntesting md5\n");
......@@ -129,14 +130,34 @@ test_md5(void)
printk("%s\n",
memcmp(result, md5_tv[4].digest,
crypto_tfm_alg_digestsize(tfm)) ? "fail" : "pass");
crypto_free_tfm(tfm);
}
printk("\ntesting hmac_md5\n");
#ifdef CONFIG_CRYPTO_HMAC
static void
test_hmac_md5(void)
{
char *p;
unsigned int i, klen;
struct scatterlist sg[2];
char result[128];
struct crypto_tfm *tfm;
struct hmac_md5_testvec *hmac_md5_tv;
unsigned int tsize;
tfm = crypto_alloc_tfm("md5", 0);
if (tfm == NULL) {
printk("failed to load transform for md5\n");
return;
}
printk("\ntesting hmac_md5\n");
tsize = sizeof (hmac_md5_tv_template);
if (tsize > TVMEMSIZE) {
printk("template (%u) too big for tvmem (%u)\n", tsize,
TVMEMSIZE);
return;
goto out;
}
memcpy(tvmem, hmac_md5_tv_template, tsize);
......@@ -151,8 +172,8 @@ test_md5(void)
sg[0].offset = ((long) p & ~PAGE_MASK);
sg[0].length = strlen(hmac_md5_tv[i].plaintext);
crypto_digest_hmac(tfm, hmac_md5_tv[i].key,
strlen(hmac_md5_tv[i].key), sg, 1, result);
klen = strlen(hmac_md5_tv[i].key);
crypto_hmac(tfm, hmac_md5_tv[i].key, &klen, sg, 1, result);
hexdump(result, crypto_tfm_alg_digestsize(tfm));
printk("%s\n",
......@@ -179,16 +200,96 @@ test_md5(void)
sg[1].length = 12;
memset(result, 0, sizeof (result));
crypto_digest_hmac(tfm, hmac_md5_tv[1].key, strlen(hmac_md5_tv[1].key),
sg, 2, result);
klen = strlen(hmac_md5_tv[7].key);
crypto_hmac(tfm, hmac_md5_tv[7].key, &klen, sg, 2, result);
hexdump(result, crypto_tfm_alg_digestsize(tfm));
printk("%s\n",
memcmp(result, hmac_md5_tv[1].digest,
memcmp(result, hmac_md5_tv[7].digest,
crypto_tfm_alg_digestsize(tfm)) ? "fail" : "pass");
out:
crypto_free_tfm(tfm);
}
static void
test_hmac_sha1(void)
{
char *p;
unsigned int i, klen;
struct crypto_tfm *tfm;
struct hmac_sha1_testvec *hmac_sha1_tv;
struct scatterlist sg[2];
unsigned int tsize;
char result[SHA1_DIGEST_SIZE];
tfm = crypto_alloc_tfm("sha1", 0);
if (tfm == NULL) {
printk("failed to load transform for sha1\n");
return;
}
printk("\ntesting hmac_sha1\n");
tsize = sizeof (hmac_sha1_tv_template);
if (tsize > TVMEMSIZE) {
printk("template (%u) too big for tvmem (%u)\n", tsize,
TVMEMSIZE);
goto out;
}
memcpy(tvmem, hmac_sha1_tv_template, tsize);
hmac_sha1_tv = (void *) tvmem;
for (i = 0; i < HMAC_SHA1_TEST_VECTORS; i++) {
printk("test %u:\n", i + 1);
memset(result, 0, sizeof (result));
p = hmac_sha1_tv[i].plaintext;
sg[0].page = virt_to_page(p);
sg[0].offset = ((long) p & ~PAGE_MASK);
sg[0].length = strlen(hmac_sha1_tv[i].plaintext);
klen = strlen(hmac_sha1_tv[i].key);
crypto_hmac(tfm, hmac_sha1_tv[i].key, &klen, sg, 1, result);
hexdump(result, sizeof (result));
printk("%s\n",
memcmp(result, hmac_sha1_tv[i].digest,
crypto_tfm_alg_digestsize(tfm)) ? "fail" :
"pass");
}
printk("\ntesting hmac_sha1 across pages\n");
/* setup the dummy buffer first */
memset(xbuf, 0, sizeof (xbuf));
memcpy(&xbuf[IDX1], "what do ya want ", 16);
memcpy(&xbuf[IDX2], "for nothing?", 12);
p = &xbuf[IDX1];
sg[0].page = virt_to_page(p);
sg[0].offset = ((long) p & ~PAGE_MASK);
sg[0].length = 16;
p = &xbuf[IDX2];
sg[1].page = virt_to_page(p);
sg[1].offset = ((long) p & ~PAGE_MASK);
sg[1].length = 12;
memset(result, 0, sizeof (result));
klen = strlen(hmac_sha1_tv[7].key);
crypto_hmac(tfm, hmac_sha1_tv[7].key, &klen, sg, 2, result);
hexdump(result, crypto_tfm_alg_digestsize(tfm));
printk("%s\n",
memcmp(result, hmac_sha1_tv[7].digest,
crypto_tfm_alg_digestsize(tfm)) ? "fail" : "pass");
out:
crypto_free_tfm(tfm);
}
#endif /* CONFIG_CRYPTO_HMAC */
static void
test_md4(void)
......@@ -247,7 +348,6 @@ test_sha1(void)
unsigned int i;
struct crypto_tfm *tfm;
struct sha1_testvec *sha1_tv;
struct hmac_sha1_testvec *hmac_sha1_tv;
struct scatterlist sg[2];
unsigned int tsize;
char result[SHA1_DIGEST_SIZE];
......@@ -313,64 +413,6 @@ test_sha1(void)
printk("%s\n",
memcmp(result, sha1_tv[1].digest,
crypto_tfm_alg_digestsize(tfm)) ? "fail" : "pass");
printk("\ntesting hmac_sha1\n");
tsize = sizeof (hmac_sha1_tv_template);
if (tsize > TVMEMSIZE) {
printk("template (%u) too big for tvmem (%u)\n", tsize,
TVMEMSIZE);
return;
}
memcpy(tvmem, hmac_sha1_tv_template, tsize);
hmac_sha1_tv = (void *) tvmem;
for (i = 0; i < HMAC_SHA1_TEST_VECTORS; i++) {
printk("test %u:\n", i + 1);
memset(result, 0, sizeof (result));
p = hmac_sha1_tv[i].plaintext;
sg[0].page = virt_to_page(p);
sg[0].offset = ((long) p & ~PAGE_MASK);
sg[0].length = strlen(hmac_sha1_tv[i].plaintext);
crypto_digest_hmac(tfm, hmac_sha1_tv[i].key,
strlen(hmac_sha1_tv[i].key), sg, 1, result);
hexdump(result, sizeof (result));
printk("%s\n",
memcmp(result, hmac_sha1_tv[i].digest,
crypto_tfm_alg_digestsize(tfm)) ? "fail" :
"pass");
}
printk("\ntesting hmac_sha1 across pages\n");
/* setup the dummy buffer first */
memset(xbuf, 0, sizeof (xbuf));
memcpy(&xbuf[IDX1], "what do ya want ", 16);
memcpy(&xbuf[IDX2], "for nothing?", 12);
p = &xbuf[IDX1];
sg[0].page = virt_to_page(p);
sg[0].offset = ((long) p & ~PAGE_MASK);
sg[0].length = 16;
p = &xbuf[IDX2];
sg[1].page = virt_to_page(p);
sg[1].offset = ((long) p & ~PAGE_MASK);
sg[1].length = 12;
memset(result, 0, sizeof (result));
crypto_digest_hmac(tfm, hmac_sha1_tv[1].key,
strlen(hmac_sha1_tv[1].key), sg, 2, result);
hexdump(result, crypto_tfm_alg_digestsize(tfm));
printk("%s\n",
memcmp(result, hmac_sha1_tv[1].digest,
crypto_tfm_alg_digestsize(tfm)) ? "fail" : "pass");
crypto_free_tfm(tfm);
}
......@@ -1299,6 +1341,19 @@ test_des3_ede(void)
crypto_free_tfm(tfm);
}
static void
test_available(void)
{
char **name = check;
while (*name) {
printk("alg %s ", *name);
printk((crypto_alg_available(*name, 0)) ?
"found\n" : "not found\n");
name++;
}
}
static void
do_test(void)
{
......@@ -1310,6 +1365,10 @@ do_test(void)
test_des();
test_des3_ede();
test_md4();
#ifdef CONFIG_CRYPTO_HMAC
test_hmac_md5();
test_hmac_sha1();
#endif
break;
case 1:
......@@ -1332,6 +1391,21 @@ do_test(void)
test_md4();
break;
#ifdef CONFIG_CRYPTO_HMAC
case 100:
test_hmac_md5();
break;
case 101:
test_hmac_sha1();
break;
#endif
case 1000:
test_available();
break;
default:
/* useful for debugging */
printk("not testing anything\n");
......
crypto/tcrypt.h
View file @ 36b8c405
......@@ -105,6 +105,7 @@ struct md5_testvec {
0xac, 0x49, 0xda, 0x2e, 0x21, 0x07, 0xb6, 0x7a } }
};
#ifdef CONFIG_CRYPTO_HMAC
/*
* HMAC-MD5 test vectors from RFC2202
* (These need to be fixed to not use strlen).
......@@ -214,7 +215,19 @@ struct hmac_md5_testvec hmac_md5_tv_template[] =
{ 0x6f, 0x63, 0x0f, 0xad, 0x67, 0xcd, 0xa0, 0xee,
0x1f, 0xb1, 0xf5, 0x62, 0xdb, 0x3a, 0xa5, 0x3e }
}
},
/* cross page test, need to retain key */
{
{ 'J', 'e', 'f', 'e', 0 },
"what do ya want for nothing?",
{ 0x75, 0x0c, 0x78, 0x3e, 0x6a, 0xb0, 0xb5, 0x03,
0xea, 0xa8, 0x6e, 0x31, 0x0a, 0x5d, 0xb7, 0x38 }
},
};
......@@ -334,9 +347,22 @@ struct hmac_sha1_testvec {
{ 0xe8, 0xe9, 0x9d, 0x0f, 0x45, 0x23, 0x7d, 0x78, 0x6d, 0x6b,
0xba, 0xa7, 0x96, 0x5c, 0x78, 0x08, 0xbb, 0xff, 0x1a, 0x91 }
}
},
/* cross page test */
{
{ 'J', 'e', 'f', 'e', 0 },
"what do ya want for nothing?",
{ 0xef, 0xfc, 0xdf, 0x6a, 0xe5, 0xeb, 0x2f, 0xa2, 0xd2, 0x74,
0x16, 0xd5, 0xf1, 0x84, 0xdf, 0x9c, 0x25, 0x9a, 0x7c, 0x79 }
},
};
#endif /* CONFIG_CRYPTO_HMAC */
/*
* SHA1 test vectors from from FIPS PUB 180-1
......
drivers/acorn/block/fd1772.c
View file @ 36b8c405
......@@ -378,23 +378,19 @@ static void do_fd_request(request_queue_t *);
/************************* End of Prototypes **************************/
static struct timer_list motor_off_timer = {
.function = fd_motor_off_timer,
};
static struct timer_list motor_off_timer =
TIMER_INITIALIZER(fd_motor_off_timer, 0, 0);
#ifdef TRACKBUFFER
static struct timer_list readtrack_timer = {
.function = fd_readtrack_check,
};
static struct timer_list readtrack_timer =
TIMER_INITIALIZER(fd_readtrack_check, 0, 0);
#endif
static struct timer_list timeout_timer = {
.function = fd_times_out,
};
static struct timer_list timeout_timer =
TIMER_INITIALIZER(fd_times_out, 0, 0);
static struct timer_list fd_timer = {
.function = check_change,
};
static struct timer_list fd_timer =
TIMER_INITIALIZER(check_change, 0, 0);
/* DAG: Haven't got a clue what this is? */
int stdma_islocked(void)
......
drivers/acorn/scsi/arxescsi.c
View file @ 36b8c405
......@@ -35,6 +35,7 @@
#include <asm/irq.h>
#include <asm/ecard.h>
#include "../../scsi/scsi.h"
#include "../../scsi/hosts.h"
#include "arxescsi.h"
#include "fas216.h"
......
drivers/acorn/scsi/cumana_2.c
View file @ 36b8c405
......@@ -35,6 +35,7 @@
#include <asm/irq.h>
#include <asm/pgtable.h>
#include "../../scsi/scsi.h"
#include "../../scsi/hosts.h"
#include "fas216.h"
#include "scsi.h"
......
drivers/acorn/scsi/eesox.c
View file @ 36b8c405
......@@ -41,6 +41,7 @@
#include <asm/ecard.h>
#include <asm/pgtable.h>
#include "../../scsi/scsi.h"
#include "../../scsi/hosts.h"
#include "fas216.h"
#include "scsi.h"
......
drivers/acorn/scsi/powertec.c
View file @ 36b8c405
......@@ -38,6 +38,7 @@
#include <asm/irq.h>
#include <asm/pgtable.h>
#include "../../scsi/scsi.h"
#include "../../scsi/hosts.h"
#include "fas216.h"
#include "scsi.h"
......
drivers/atm/idt77105.c
View file @ 36b8c405
......@@ -48,12 +48,10 @@ static void idt77105_stats_timer_func(unsigned long);
static void idt77105_restart_timer_func(unsigned long);
static struct timer_list stats_timer = {
function: &idt77105_stats_timer_func
};
static struct timer_list restart_timer = {
function: &idt77105_restart_timer_func
};
static struct timer_list stats_timer =
TIMER_INITIALIZER(idt77105_stats_timer_func, 0, 0);
static struct timer_list restart_timer =
TIMER_INITIALIZER(idt77105_restart_timer_func, 0, 0);
static int start_timer = 1;
static struct idt77105_priv *idt77105_all = NULL;
......
drivers/atm/iphase.c
View file @ 36b8c405
......@@ -78,7 +78,7 @@ static IADEV *ia_dev[8];
static struct atm_dev *_ia_dev[8];
static int iadev_count;
static void ia_led_timer(unsigned long arg);
static struct timer_list ia_timer = { function: ia_led_timer };
static struct timer_list ia_timer = TIMER_INITIALIZER(ia_led_timer, 0, 0);
struct atm_vcc *vcc_close_que[100];
static int IA_TX_BUF = DFL_TX_BUFFERS, IA_TX_BUF_SZ = DFL_TX_BUF_SZ;
static int IA_RX_BUF = DFL_RX_BUFFERS, IA_RX_BUF_SZ = DFL_RX_BUF_SZ;
......
drivers/block/acsi.c
View file @ 36b8c405
......@@ -374,7 +374,7 @@ static int acsi_revalidate (struct gendisk *disk);
/************************* End of Prototypes **************************/
struct timer_list acsi_timer = { function: acsi_times_out };
struct timer_list acsi_timer = TIMER_INITIALIZER(acsi_times_out, 0, 0);
#ifdef CONFIG_ATARI_SLM
......
drivers/block/acsi_slm.c
View file @ 36b8c405
......@@ -270,15 +270,15 @@ static int slm_get_pagesize( int device, int *w, int *h );
/************************* End of Prototypes **************************/
static struct timer_list slm_timer = { function: slm_test_ready };
static struct timer_list slm_timer = TIMER_INITIALIZER(slm_test_ready, 0, 0);
static struct file_operations slm_fops = {
owner: THIS_MODULE,
read: slm_read,
write: slm_write,
ioctl: slm_ioctl,
open: slm_open,
release: slm_release,
.owner = THIS_MODULE,
.read = slm_read,
.write = slm_write,
.ioctl = slm_ioctl,
.open = slm_open,
.release = slm_release,
};
......
drivers/block/ataflop.c
View file @ 36b8c405
......@@ -395,15 +395,15 @@ static int floppy_release( struct inode * inode, struct file * filp );
/************************* End of Prototypes **************************/
static struct timer_list motor_off_timer =
{ function: fd_motor_off_timer };
static struct timer_list readtrack_timer =
{ function: fd_readtrack_check };
TIMER_INITIALIZER(fd_motor_off_timer, 0, 0);
static struct timer_list readtrack_timer
TIMER_INITIALIZER(fd_readtrack_check, 0, 0);
static struct timer_list timeout_timer =
{ function: fd_times_out };
TIMER_INITIALIZER(fd_times_out, 0, 0);
static struct timer_list fd_timer =
{ function: check_change };
TIMER_INITIALIZER(check_change, 0, 0);
static inline void
start_motor_off_timer(void)
......
drivers/block/cciss.c
View file @ 36b8c405
......@@ -2505,10 +2505,10 @@ static void __devexit cciss_remove_one (struct pci_dev *pdev)
}
static struct pci_driver cciss_pci_driver = {
name: "cciss",
probe: cciss_init_one,
remove: __devexit_p(cciss_remove_one),
id_table: cciss_pci_device_id, /* id_table */
.name = "cciss",
.probe = cciss_init_one,
.remove = __devexit_p(cciss_remove_one),
.id_table = cciss_pci_device_id, /* id_table */
};
/*
......
drivers/block/elevator.c
View file @ 36b8c405
......@@ -380,9 +380,9 @@ inline struct list_head *elv_get_sort_head(request_queue_t *q,
}
elevator_t elevator_noop = {
elevator_merge_fn: elevator_noop_merge,
elevator_next_req_fn: elevator_noop_next_request,
elevator_add_req_fn: elevator_noop_add_request,
.elevator_merge_fn = elevator_noop_merge,
.elevator_next_req_fn = elevator_noop_next_request,
.elevator_add_req_fn = elevator_noop_add_request,
};
module_init(elevator_global_init);
......
drivers/block/floppy.c
View file @ 36b8c405
......@@ -554,7 +554,7 @@ static void floppy_ready(void);
static void floppy_start(void);
static void process_fd_request(void);
static void recalibrate_floppy(void);
static void floppy_shutdown(void);
static void floppy_shutdown(unsigned long);
static int floppy_grab_irq_and_dma(void);
static void floppy_release_irq_and_dma(void);
......@@ -628,7 +628,7 @@ static inline void debugt(const char *message)
}
typedef void (*timeout_fn)(unsigned long);
static struct timer_list fd_timeout ={ function: (timeout_fn) floppy_shutdown };
static struct timer_list fd_timeout = TIMER_INITIALIZER(floppy_shutdown, 0, 0);
static const char *timeout_message;
......@@ -1011,7 +1011,7 @@ static void schedule_bh( void (*handler)(void*) )
schedule_work(&floppy_work);
}
static struct timer_list fd_timer;
static struct timer_list fd_timer = TIMER_INITIALIZER(NULL, 0, 0);
static void cancel_activity(void)
{
......@@ -1900,7 +1900,7 @@ static void show_floppy(void)
printk("\n");
}
static void floppy_shutdown(void)
static void floppy_shutdown(unsigned long data)
{
unsigned long flags;
......@@ -4347,6 +4347,7 @@ int __init floppy_init(void)
}
for (drive = 0; drive < N_DRIVE; drive++) {
init_timer(&motor_off_timer[drive]);
motor_off_timer[drive].data = drive;
motor_off_timer[drive].function = motor_off_callback;
if (!(allowed_drive_mask & (1 << drive)))
......
drivers/block/genhd.c
View file @ 36b8c405
......@@ -242,10 +242,10 @@ static int show_partition(struct seq_file *part, void *v)
}
struct seq_operations partitions_op = {
start: part_start,
next: part_next,
stop: part_stop,
show: show_partition
.start =part_start,
.next = part_next,
.stop = part_stop,
.show = show_partition
};
#endif
......
drivers/block/loop.c
View file @ 36b8c405
......@@ -137,15 +137,15 @@ static int xor_status(struct loop_device *lo, struct loop_info *info)
}
struct loop_func_table none_funcs = {
number: LO_CRYPT_NONE,
transfer: transfer_none,
init: none_status,
.number = LO_CRYPT_NONE,
.transfer = transfer_none,
.init = none_status,
};
struct loop_func_table xor_funcs = {
number: LO_CRYPT_XOR,
transfer: transfer_xor,
init: xor_status
.number = LO_CRYPT_XOR,
.transfer = transfer_xor,
.init = xor_status
};
/* xfer_funcs[0] is special - its release function is never called */
......@@ -969,10 +969,10 @@ static int lo_release(struct inode *inode, struct file *file)
}
static struct block_device_operations lo_fops = {
owner: THIS_MODULE,
open: lo_open,
release: lo_release,
ioctl: lo_ioctl,
.owner = THIS_MODULE,
.open = lo_open,
.release = lo_release,
.ioctl = lo_ioctl,
};
/*
......
drivers/block/nbd.c
View file @ 36b8c405
......@@ -466,10 +466,10 @@ static int nbd_release(struct inode *inode, struct file *file)
static struct block_device_operations nbd_fops =
{
owner: THIS_MODULE,
open: nbd_open,
release: nbd_release,
ioctl: nbd_ioctl,
.owner = THIS_MODULE,
.open = nbd_open,
.release = nbd_release,
.ioctl = nbd_ioctl,
};
/*
......
drivers/block/paride/pg.c
View file @ 36b8c405
......@@ -254,11 +254,11 @@ static char pg_scratch[512]; /* scratch block buffer */
/* kernel glue structures */
static struct file_operations pg_fops = {
owner: THIS_MODULE,
read: pg_read,
write: pg_write,
open: pg_open,
release: pg_release,
.owner = THIS_MODULE,
.read = pg_read,
.write = pg_write,
.open = pg_open,
.release = pg_release,
};
void pg_init_units( void )
......
drivers/block/paride/pseudo.h
View file @ 36b8c405
......@@ -49,7 +49,7 @@ static int ps_nice = 0;
static spinlock_t ps_spinlock __attribute__((unused)) = SPIN_LOCK_UNLOCKED;
static struct timer_list ps_timer = { function: ps_timer_int };
static struct timer_list ps_timer = TIMER_INITIALIZER(ps_timer_int, 0, 0);
static DECLARE_WORK(ps_tq, ps_tq_int, NULL);
static void ps_set_intr( void (*continuation)(void),
......
drivers/block/paride/pt.c
View file @ 36b8c405
......@@ -256,12 +256,12 @@ static char pt_scratch[512]; /* scratch block buffer */
/* kernel glue structures */
static struct file_operations pt_fops = {
owner: THIS_MODULE,
read: pt_read,
write: pt_write,
ioctl: pt_ioctl,
open: pt_open,
release: pt_release,
.owner = THIS_MODULE,
.read = pt_read,
.write = pt_write,
.ioctl = pt_ioctl,
.open = pt_open,
.release = pt_release,
};
void pt_init_units( void )
......
drivers/block/ps2esdi.c
View file @ 36b8c405
......@@ -107,7 +107,8 @@ static DECLARE_WAIT_QUEUE_HEAD(ps2esdi_int);
static int no_int_yet;
static int ps2esdi_drives;
static u_short io_base;
static struct timer_list esdi_timer = { function: ps2esdi_reset_timer };
static struct timer_list esdi_timer =
TIMER_INITIALIZER(ps2esdi_reset_timer, 0, 0);
static int reset_status;
static int ps2esdi_slot = -1;
static int tp720esdi = 0; /* Is it Integrated ESDI of ThinkPad-720? */
......
drivers/block/rd.c
View file @ 36b8c405
This diff is collapsed.
drivers/block/swim_iop.c
View file @ 36b8c405
......@@ -464,6 +464,7 @@ static void set_timeout(struct floppy_state *fs, int nticks,
save_flags(flags); cli();
if (fs->timeout_pending)
del_timer(&fs->timeout);
init_timer(&fs->timeout);
fs->timeout.expires = jiffies + nticks;
fs->timeout.function = proc;
fs->timeout.data = (unsigned long) fs;
......
drivers/block/umem.c
View file @ 36b8c405
This diff is collapsed.
drivers/cdrom/aztcd.c
View file @ 36b8c405
This diff is collapsed.
drivers/cdrom/cm206.c
View file @ 36b8c405
This diff is collapsed.
drivers/cdrom/gscd.c
View file @ 36b8c405
This diff is collapsed.
drivers/cdrom/mcd.c
View file @ 36b8c405
This diff is collapsed.
drivers/cdrom/optcd.c
View file @ 36b8c405
This diff is collapsed.
drivers/cdrom/sbpcd.c
View file @ 36b8c405
This diff is collapsed.
drivers/cdrom/sjcd.c
View file @ 36b8c405
This diff is collapsed.
drivers/char/ChangeLog
View file @ 36b8c405
This diff is collapsed.
drivers/char/agp/agp.c
View file @ 36b8c405
This diff is collapsed.
drivers/char/cyclades.c
View file @ 36b8c405
This diff is collapsed.
drivers/char/i810_rng.c
View file @ 36b8c405
This diff is collapsed.
drivers/char/ip2/i2ellis.c
View file @ 36b8c405
This diff is collapsed.
drivers/char/ip2main.c
View file @ 36b8c405
This diff is collapsed.
drivers/char/istallion.c
View file @ 36b8c405
This diff is collapsed.
drivers/char/keyboard.c
View file @ 36b8c405
This diff is collapsed.
drivers/char/mixcomwd.c
View file @ 36b8c405
This diff is collapsed.
drivers/char/softdog.c
View file @ 36b8c405
This diff is collapsed.
drivers/fc4/fc.c
View file @ 36b8c405
This diff is collapsed.
drivers/hotplug/Kconfig
View file @ 36b8c405
This diff is collapsed.
drivers/hotplug/Makefile
View file @ 36b8c405
This diff is collapsed.
drivers/hotplug/acpiphp.h
View file @ 36b8c405
This diff is collapsed.
drivers/hotplug/acpiphp_core.c
View file @ 36b8c405
This diff is collapsed.
drivers/hotplug/acpiphp_glue.c
View file @ 36b8c405
This diff is collapsed.
drivers/hotplug/acpiphp_pci.c
View file @ 36b8c405
This diff is collapsed.
drivers/hotplug/acpiphp_res.c
View file @ 36b8c405
This diff is collapsed.
drivers/hotplug/cpci_hotplug.h 0 → 100644
View file @ 36b8c405
This diff is collapsed.
drivers/hotplug/cpci_hotplug_core.c 0 → 100644
View file @ 36b8c405
This diff is collapsed.
drivers/hotplug/cpci_hotplug_pci.c 0 → 100644
View file @ 36b8c405
This diff is collapsed.
drivers/hotplug/cpcihp_generic.c 0 → 100644
View file @ 36b8c405
This diff is collapsed.
drivers/hotplug/cpcihp_zt5550.c 0 → 100644
View file @ 36b8c405
This diff is collapsed.
drivers/hotplug/cpcihp_zt5550.h 0 → 100644
View file @ 36b8c405
This diff is collapsed.
drivers/hotplug/pci_hotplug.h
View file @ 36b8c405
This diff is collapsed.
drivers/hotplug/pci_hotplug_util.c
View file @ 36b8c405
This diff is collapsed.
drivers/ide/legacy/ide-cs.c
View file @ 36b8c405
This diff is collapsed.
drivers/ide/pci/sl82c105.c
View file @ 36b8c405
This diff is collapsed.
drivers/ide/ppc/pmac.c
View file @ 36b8c405
This diff is collapsed.
drivers/ieee1394/sbp2.c
View file @ 36b8c405
This diff is collapsed.
drivers/ieee1394/sbp2.h
View file @ 36b8c405
This diff is collapsed.
drivers/input/mouse/Kconfig
View file @ 36b8c405
This diff is collapsed.
drivers/input/mouse/Makefile
View file @ 36b8c405
This diff is collapsed.
drivers/input/mouse/rpcmouse.c
View file @ 36b8c405
This diff is collapsed.
drivers/input/serio/Kconfig
View file @ 36b8c405
This diff is collapsed.
drivers/input/serio/ambakmi.c
View file @ 36b8c405
This diff is collapsed.
drivers/input/serio/i8042.c
View file @ 36b8c405
This diff is collapsed.
drivers/input/serio/rpckbd.c
View file @ 36b8c405
This diff is collapsed.
drivers/macintosh/mac_keyb.c
View file @ 36b8c405
This diff is collapsed.
drivers/macintosh/macserial.c
View file @ 36b8c405
This diff is collapsed.
drivers/macintosh/macserial.h
View file @ 36b8c405
This diff is collapsed.
drivers/md/md.c
View file @ 36b8c405
This diff is collapsed.
drivers/md/raid1.c
View file @ 36b8c405
This diff is collapsed.
drivers/md/raid5.c
View file @ 36b8c405
This diff is collapsed.
drivers/media/video/msp3400.c
View file @ 36b8c405
This diff is collapsed.
drivers/media/video/tvaudio.c
View file @ 36b8c405
This diff is collapsed.
drivers/mtd/cmdline.c
View file @ 36b8c405
This diff is collapsed.
drivers/mtd/ftl.c
View file @ 36b8c405
This diff is collapsed.
drivers/mtd/mtdblock.c
View file @ 36b8c405
This diff is collapsed.
drivers/net/atari_bionet.c
View file @ 36b8c405
This diff is collapsed.
drivers/net/atari_pamsnet.c
View file @ 36b8c405
This diff is collapsed.
drivers/net/bmac.c
View file @ 36b8c405
This diff is collapsed.
drivers/net/e100/e100.h
View file @ 36b8c405
This diff is collapsed.
drivers/net/e100/e100_main.c
View file @ 36b8c405
This diff is collapsed.
drivers/net/e100/e100_test.c
View file @ 36b8c405
This diff is collapsed.
drivers/net/hamradio/yam.c
View file @ 36b8c405
This diff is collapsed.
drivers/net/irda/irda-usb.c
View file @ 36b8c405
This diff is collapsed.
drivers/net/pcmcia/3c574_cs.c
View file @ 36b8c405
This diff is collapsed.
drivers/net/pcmcia/3c589_cs.c
View file @ 36b8c405
This diff is collapsed.
drivers/net/pcmcia/ax8390.h deleted 100644 → 0
View file @ 348ed50d
This diff is collapsed.
drivers/net/pcmcia/axnet_cs.c
View file @ 36b8c405
This diff is collapsed.
drivers/net/pcmcia/fmvj18x_cs.c
View file @ 36b8c405
This diff is collapsed.
drivers/net/pcmcia/nmclan_cs.c
View file @ 36b8c405
This diff is collapsed.
drivers/net/pcmcia/pcnet_cs.c
View file @ 36b8c405
This diff is collapsed.
drivers/net/pcmcia/ray_cs.c
View file @ 36b8c405
This diff is collapsed.
drivers/net/pcmcia/smc91c92_cs.c
View file @ 36b8c405
This diff is collapsed.
drivers/net/tulip/de2104x.c
View file @ 36b8c405
This diff is collapsed.
drivers/net/tulip/de4x5.c
View file @ 36b8c405
This diff is collapsed.
drivers/net/wan/comx-hw-munich.c
View file @ 36b8c405
This diff is collapsed.
drivers/net/wan/comx-proto-fr.c
View file @ 36b8c405
This diff is collapsed.
drivers/net/wireless/airo_cs.c
View file @ 36b8c405
This diff is collapsed.
drivers/net/wireless/wavelan.p.h
View file @ 36b8c405
This diff is collapsed.
drivers/oprofile/buffer_sync.c
View file @ 36b8c405
This diff is collapsed.
drivers/parport/parport_cs.c
View file @ 36b8c405
This diff is collapsed.
drivers/pci/Makefile
View file @ 36b8c405
This diff is collapsed.
drivers/pci/hotplug.c
View file @ 36b8c405
This diff is collapsed.
drivers/pci/pci.c
View file @ 36b8c405
This diff is collapsed.
drivers/pci/probe.c
View file @ 36b8c405
This diff is collapsed.
drivers/pci/quirks.c
View file @ 36b8c405
This diff is collapsed.
drivers/pci/search.c
View file @ 36b8c405
This diff is collapsed.
drivers/pci/setup-bus.c
View file @ 36b8c405
This diff is collapsed.
drivers/pcmcia/cardbus.c
View file @ 36b8c405
This diff is collapsed.
drivers/pcmcia/cirrus.h
View file @ 36b8c405
This diff is collapsed.
drivers/pcmcia/cistpl.c
View file @ 36b8c405
This diff is collapsed.
drivers/pcmcia/cs_internal.h
View file @ 36b8c405
This diff is collapsed.
drivers/pcmcia/ds.c
View file @ 36b8c405
This diff is collapsed.
drivers/pcmcia/i82365.c
View file @ 36b8c405
This diff is collapsed.
drivers/pcmcia/i82365.h
View file @ 36b8c405
This diff is collapsed.
drivers/pcmcia/o2micro.h
View file @ 36b8c405
This diff is collapsed.
drivers/pcmcia/ricoh.h
View file @ 36b8c405
This diff is collapsed.
drivers/pcmcia/sa1100_generic.c
View file @ 36b8c405
This diff is collapsed.
drivers/pcmcia/tcic.c
View file @ 36b8c405
This diff is collapsed.
drivers/pcmcia/tcic.h
View file @ 36b8c405
This diff is collapsed.
drivers/pcmcia/ti113x.h
View file @ 36b8c405
This diff is collapsed.
drivers/pcmcia/topic.h
View file @ 36b8c405
This diff is collapsed.
drivers/pcmcia/vg468.h
View file @ 36b8c405
This diff is collapsed.
drivers/sbus/char/aurora.c
View file @ 36b8c405
This diff is collapsed.
drivers/sbus/char/bpp.c
View file @ 36b8c405
This diff is collapsed.
drivers/sbus/char/cpwatchdog.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/Kconfig
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/NCR5380.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/NCR53c406a.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/NCR53c406a.h deleted 100644 → 0
View file @ 348ed50d
This diff is collapsed.
drivers/scsi/aha1740.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/aha1740.h
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/aic7xxx_old.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/aic7xxx_old/aic7xxx.h
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/aic7xxx_old/aic7xxx_proc.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/eata.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/eata.h
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/eata_pio.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/eata_pio.h
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/esp.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/esp.h
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/fd_mcs.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/fd_mcs.h
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/g_NCR5380.h
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/hosts.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/hosts.h
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/ibmmca.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/ibmmca.h
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/in2000.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/megaraid.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/megaraid.h
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/osst.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/pcmcia/nsp_cs.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/pcmcia/nsp_cs.h
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/pcmcia/nsp_message.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/pluto.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/qlogicfas.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/qlogicpti.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/qlogicpti.h
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/scsi.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/scsi.h
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/scsi_debug.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/scsi_debug.h
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/scsi_mid_low_api.txt
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/scsi_scan.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/scsi_syms.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/sd.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/sg.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/sr.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/sr.h
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/st.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/u14-34f.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/u14-34f.h
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/ultrastor.c
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/ultrastor.h
View file @ 36b8c405
This diff is collapsed.
drivers/scsi/wd7000.c
View file @ 36b8c405
This diff is collapsed.
drivers/serial/68328serial.c 0 → 100644
View file @ 36b8c405
This diff is collapsed.
drivers/serial/68328serial.h 0 → 100644
View file @ 36b8c405
This diff is collapsed.
drivers/serial/68360serial.c 0 → 100644
View file @ 36b8c405
This diff is collapsed.
drivers/serial/Kconfig
View file @ 36b8c405
This diff is collapsed.
drivers/serial/Makefile
View file @ 36b8c405
This diff is collapsed.
drivers/serial/amba.c
View file @ 36b8c405
This diff is collapsed.
drivers/serial/anakin.c
View file @ 36b8c405
This diff is collapsed.
drivers/serial/clps711x.c
View file @ 36b8c405
This diff is collapsed.
drivers/serial/mcfserial.c 0 → 100644
View file @ 36b8c405
This diff is collapsed.
drivers/serial/mcfserial.h 0 → 100644
View file @ 36b8c405
This diff is collapsed.
drivers/serial/nb85e_uart.c 0 → 100644
View file @ 36b8c405
This diff is collapsed.
drivers/serial/sunzilog.c
View file @ 36b8c405
This diff is collapsed.
drivers/serial/uart00.c
View file @ 36b8c405
This diff is collapsed.
drivers/usb/class/Kconfig
View file @ 36b8c405
This diff is collapsed.
drivers/usb/core/devio.c
View file @ 36b8c405
This diff is collapsed.
drivers/usb/core/hcd.h
View file @ 36b8c405
This diff is collapsed.
drivers/usb/host/ohci-dbg.c
View file @ 36b8c405
This diff is collapsed.
drivers/usb/host/ohci-pci.c
View file @ 36b8c405
This diff is collapsed.
drivers/usb/host/ohci-q.c
View file @ 36b8c405
This diff is collapsed.
drivers/usb/host/ohci-sa1111.c
View file @ 36b8c405
This diff is collapsed.
drivers/usb/host/ohci.h
View file @ 36b8c405
This diff is collapsed.
drivers/usb/image/scanner.c
View file @ 36b8c405
This diff is collapsed.
drivers/usb/image/scanner.h
View file @ 36b8c405
This diff is collapsed.
drivers/usb/media/vicam.c
View file @ 36b8c405
This diff is collapsed.
drivers/usb/misc/Kconfig
View file @ 36b8c405
This diff is collapsed.
drivers/usb/misc/usbtest.c
View file @ 36b8c405
This diff is collapsed.
drivers/usb/serial/visor.c
View file @ 36b8c405
This diff is collapsed.
drivers/usb/serial/visor.h
View file @ 36b8c405
This diff is collapsed.
drivers/usb/storage/datafab.c
View file @ 36b8c405
This diff is collapsed.
drivers/usb/storage/freecom.c
View file @ 36b8c405
This diff is collapsed.
drivers/usb/storage/isd200.c
View file @ 36b8c405
This diff is collapsed.
drivers/usb/storage/jumpshot.c
View file @ 36b8c405
This diff is collapsed.
drivers/usb/storage/sddr09.c
View file @ 36b8c405
This diff is collapsed.
drivers/usb/storage/sddr55.c
View file @ 36b8c405
This diff is collapsed.
drivers/usb/storage/shuttle_usbat.c
View file @ 36b8c405
This diff is collapsed.
drivers/usb/storage/transport.c
View file @ 36b8c405
This diff is collapsed.
drivers/video/fbcon.c
View file @ 36b8c405
This diff is collapsed.
fs/Kconfig
View file @ 36b8c405
This diff is collapsed.
fs/affs/amigaffs.c
View file @ 36b8c405
This diff is collapsed.
fs/affs/super.c
View file @ 36b8c405
This diff is collapsed.
fs/binfmt_elf.c
View file @ 36b8c405
This diff is collapsed.
fs/block_dev.c
View file @ 36b8c405
This diff is collapsed.
fs/eventpoll.c
View file @ 36b8c405
This diff is collapsed.
fs/exec.c
View file @ 36b8c405
This diff is collapsed.
fs/ext2/acl.c
View file @ 36b8c405
This diff is collapsed.
fs/ext2/dir.c
View file @ 36b8c405
This diff is collapsed.
fs/ext2/inode.c
View file @ 36b8c405
This diff is collapsed.
fs/ext2/super.c
View file @ 36b8c405
This diff is collapsed.
fs/ext2/xattr_user.c
View file @ 36b8c405
This diff is collapsed.
fs/ext3/acl.c
View file @ 36b8c405
This diff is collapsed.
fs/ext3/dir.c
View file @ 36b8c405
This diff is collapsed.
fs/ext3/ialloc.c
View file @ 36b8c405
This diff is collapsed.
fs/ext3/inode.c
View file @ 36b8c405
This diff is collapsed.
fs/ext3/namei.c
View file @ 36b8c405
This diff is collapsed.
fs/ext3/super.c
View file @ 36b8c405
This diff is collapsed.
fs/ext3/xattr_user.c
View file @ 36b8c405
This diff is collapsed.
fs/fat/inode.c
View file @ 36b8c405
This diff is collapsed.
fs/file_table.c
View file @ 36b8c405
This diff is collapsed.
fs/hpfs/dnode.c
View file @ 36b8c405
This diff is collapsed.
fs/hpfs/inode.c
View file @ 36b8c405
This diff is collapsed.
fs/hpfs/super.c
View file @ 36b8c405
This diff is collapsed.
fs/intermezzo/vfs.c
View file @ 36b8c405
This diff is collapsed.
fs/jfs/inode.c
View file @ 36b8c405
This diff is collapsed.
fs/locks.c
View file @ 36b8c405
This diff is collapsed.
fs/mbcache.c
View file @ 36b8c405
This diff is collapsed.
fs/nfs/file.c
View file @ 36b8c405
This diff is collapsed.
fs/nfs/flushd.c
View file @ 36b8c405
This diff is collapsed.
fs/nfs/inode.c
View file @ 36b8c405
This diff is collapsed.
fs/nfs/pagelist.c
View file @ 36b8c405
This diff is collapsed.
fs/nfs/read.c
View file @ 36b8c405
This diff is collapsed.
fs/nfsd/nfs3proc.c
View file @ 36b8c405
This diff is collapsed.
fs/nfsd/nfs3xdr.c
View file @ 36b8c405
This diff is collapsed.
fs/nfsd/nfsproc.c
View file @ 36b8c405
This diff is collapsed.
fs/nfsd/nfsxdr.c
View file @ 36b8c405
This diff is collapsed.
fs/nfsd/vfs.c
View file @ 36b8c405
This diff is collapsed.
fs/ntfs/inode.c
View file @ 36b8c405
This diff is collapsed.
fs/read_write.c
View file @ 36b8c405
This diff is collapsed.
fs/stat.c
View file @ 36b8c405
This diff is collapsed.
fs/ufs/dir.c
View file @ 36b8c405
This diff is collapsed.
fs/ufs/inode.c
View file @ 36b8c405
This diff is collapsed.
fs/ufs/super.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/Makefile
View file @ 36b8c405
This diff is collapsed.
fs/xfs/linux/xfs_aops.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/linux/xfs_iomap.c 0 → 100644
View file @ 36b8c405
This diff is collapsed.
fs/xfs/linux/xfs_iops.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/linux/xfs_linux.h
View file @ 36b8c405
This diff is collapsed.
fs/xfs/linux/xfs_lrw.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/linux/xfs_lrw.h
View file @ 36b8c405
This diff is collapsed.
fs/xfs/linux/xfs_super.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/linux/xfs_super.h
View file @ 36b8c405
This diff is collapsed.
fs/xfs/linux/xfs_sysctl.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/linux/xfs_sysctl.h
View file @ 36b8c405
This diff is collapsed.
fs/xfs/linux/xfs_vnode.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/linux/xfs_vnode.h
View file @ 36b8c405
This diff is collapsed.
fs/xfs/pagebuf/page_buf.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/pagebuf/page_buf.h
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs.h
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_acl.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_acl.h
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_attr.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_bmap_btree.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_buf.h
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_buf_item.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_da_btree.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_da_btree.h
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_dir.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_dir2.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_dir2_node.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_dmapi.h
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_fsops.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_iget.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_inode.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_inode.h
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_log.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_log_recover.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_macros.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_mount.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_mount.h
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_qm.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_rename.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_rtalloc.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_rw.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_rw.h
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_vfsops.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfs_vnodeops.c
View file @ 36b8c405
This diff is collapsed.
fs/xfs/xfsidbg.c
View file @ 36b8c405
This diff is collapsed.
include/asm-arm/arch-sa1100/SA-1101.h
View file @ 36b8c405
This diff is collapsed.
include/asm-arm/arch-sa1100/hardware.h
View file @ 36b8c405
This diff is collapsed.
include/asm-i386/elf.h
View file @ 36b8c405
This diff is collapsed.
include/asm-i386/timer.h
View file @ 36b8c405
This diff is collapsed.
include/asm-ia64/elf.h
View file @ 36b8c405
This diff is collapsed.
include/asm-sparc/poll.h
View file @ 36b8c405
This diff is collapsed.
include/asm-sparc/system.h
View file @ 36b8c405
This diff is collapsed.
include/asm-sparc/unistd.h
View file @ 36b8c405
This diff is collapsed.
include/asm-sparc/vac-ops.h
View file @ 36b8c405
This diff is collapsed.
include/asm-sparc64/poll.h
View file @ 36b8c405
This diff is collapsed.
include/asm-sparc64/unistd.h
View file @ 36b8c405
This diff is collapsed.
include/linux/crypto.h
View file @ 36b8c405
This diff is collapsed.
include/linux/elf.h
View file @ 36b8c405
This diff is collapsed.
include/linux/elfcore.h
View file @ 36b8c405
This diff is collapsed.
include/linux/eventpoll.h
View file @ 36b8c405
This diff is collapsed.
include/linux/ext3_fs.h
View file @ 36b8c405
This diff is collapsed.
include/linux/fs.h
View file @ 36b8c405
This diff is collapsed.
include/linux/in.h
View file @ 36b8c405
This diff is collapsed.
include/linux/ipsec.h
View file @ 36b8c405
This diff is collapsed.
include/linux/mtd/ftl.h
View file @ 36b8c405
This diff is collapsed.
include/linux/nfs_fs.h
View file @ 36b8c405
This diff is collapsed.
include/linux/nfsd/xdr.h
View file @ 36b8c405
This diff is collapsed.
include/linux/nfsd/xdr3.h
View file @ 36b8c405
This diff is collapsed.
include/linux/pagemap.h
View file @ 36b8c405
This diff is collapsed.
include/linux/pci.h
View file @ 36b8c405
This diff is collapsed.
include/linux/pci_ids.h
View file @ 36b8c405
This diff is collapsed.
include/linux/pfkeyv2.h
View file @ 36b8c405
This diff is collapsed.
include/linux/pnpbios.h
View file @ 36b8c405
This diff is collapsed.
include/linux/poll.h
View file @ 36b8c405
This diff is collapsed.
include/linux/sched.h
View file @ 36b8c405
This diff is collapsed.
include/linux/sunrpc/svc.h
View file @ 36b8c405
This diff is collapsed.
include/linux/sunrpc/svcsock.h
View file @ 36b8c405
This diff is collapsed.
include/linux/timer.h
View file @ 36b8c405
This diff is collapsed.
include/linux/umem.h
View file @ 36b8c405
This diff is collapsed.
include/linux/workqueue.h
View file @ 36b8c405
This diff is collapsed.
include/net/dst.h
View file @ 36b8c405
This diff is collapsed.
include/net/protocol.h
View file @ 36b8c405
This diff is collapsed.
include/net/route.h
View file @ 36b8c405
This diff is collapsed.
include/net/sock.h
View file @ 36b8c405
This diff is collapsed.
include/net/xfrm.h
View file @ 36b8c405
This diff is collapsed.
include/pcmcia/ciscode.h
View file @ 36b8c405
This diff is collapsed.
kernel/exit.c
View file @ 36b8c405
This diff is collapsed.
kernel/fork.c
View file @ 36b8c405
This diff is collapsed.
kernel/ksyms.c
View file @ 36b8c405
This diff is collapsed.
kernel/signal.c
View file @ 36b8c405
This diff is collapsed.
kernel/timer.c
View file @ 36b8c405
This diff is collapsed.
lib/Kconfig
View file @ 36b8c405
This diff is collapsed.
mm/readahead.c
View file @ 36b8c405
This diff is collapsed.
mm/slab.c
View file @ 36b8c405
This diff is collapsed.
net/Kconfig
View file @ 36b8c405
This diff is collapsed.
net/Makefile
View file @ 36b8c405
This diff is collapsed.
net/bridge/br_netfilter.c
View file @ 36b8c405
This diff is collapsed.
net/core/Makefile
View file @ 36b8c405
This diff is collapsed.
net/core/dev.c
View file @ 36b8c405
This diff is collapsed.
net/core/dst.c
View file @ 36b8c405
This diff is collapsed.
net/core/pktgen.c 0 → 100644
View file @ 36b8c405
This diff is collapsed.
net/ipv4/Kconfig
View file @ 36b8c405
This diff is collapsed.
net/ipv4/Makefile
View file @ 36b8c405
This diff is collapsed.
net/ipv4/af_inet.c
View file @ 36b8c405
This diff is collapsed.
net/ipv4/ah.c
View file @ 36b8c405
This diff is collapsed.
net/ipv4/esp.c 0 → 100644
View file @ 36b8c405
This diff is collapsed.
net/ipv4/fib_hash.c
View file @ 36b8c405
This diff is collapsed.
net/ipv4/inetpeer.c
View file @ 36b8c405
This diff is collapsed.
net/ipv4/ip_forward.c
View file @ 36b8c405
This diff is collapsed.
net/ipv4/ip_gre.c
View file @ 36b8c405
This diff is collapsed.
net/ipv4/ip_input.c
View file @ 36b8c405
This diff is collapsed.
net/ipv4/ip_output.c
View file @ 36b8c405
This diff is collapsed.
net/ipv4/ip_sockglue.c
View file @ 36b8c405
This diff is collapsed.
net/ipv4/ipip.c
View file @ 36b8c405
This diff is collapsed.
net/ipv4/ipmr.c
View file @ 36b8c405
This diff is collapsed.
net/ipv4/netfilter/ipt_TCPMSS.c
View file @ 36b8c405
This diff is collapsed.
net/ipv4/netfilter/ipt_physdev.c
View file @ 36b8c405
This diff is collapsed.
net/ipv4/raw.c
View file @ 36b8c405
This diff is collapsed.
net/ipv4/route.c
View file @ 36b8c405
This diff is collapsed.
net/ipv4/tcp_input.c
View file @ 36b8c405
This diff is collapsed.
net/ipv4/tcp_ipv4.c
View file @ 36b8c405
This diff is collapsed.
net/ipv4/tcp_minisocks.c
View file @ 36b8c405
This diff is collapsed.
net/ipv4/udp.c
View file @ 36b8c405
This diff is collapsed.
net/ipv4/xfrm_input.c
View file @ 36b8c405
This diff is collapsed.
net/ipv4/xfrm_policy.c
View file @ 36b8c405
This diff is collapsed.
net/ipv4/xfrm_state.c
View file @ 36b8c405
This diff is collapsed.
net/ipv6/route.c
View file @ 36b8c405
This diff is collapsed.
net/ipv6/tcp_ipv6.c
View file @ 36b8c405
This diff is collapsed.
net/key/Makefile 0 → 100644
View file @ 36b8c405
This diff is collapsed.
net/key/af_key.c 0 → 100644
View file @ 36b8c405
This diff is collapsed.
net/netsyms.c
View file @ 36b8c405
This diff is collapsed.
net/packet/af_packet.c
View file @ 36b8c405
This diff is collapsed.
net/sctp/input.c
View file @ 36b8c405
This diff is collapsed.
net/socket.c
View file @ 36b8c405
This diff is collapsed.
net/sunrpc/svc.c
View file @ 36b8c405
This diff is collapsed.
net/sunrpc/svcsock.c
View file @ 36b8c405
This diff is collapsed.
net/wanrouter/af_wanpipe.c
View file @ 36b8c405
This diff is collapsed.
sound/core/timer.c
View file @ 36b8c405
This diff is collapsed.
sound/drivers/dummy.c
View file @ 36b8c405
This diff is collapsed.
sound/drivers/mtpav.c
View file @ 36b8c405
This diff is collapsed.
sound/drivers/serial-u16550.c
View file @ 36b8c405
This diff is collapsed.
sound/oss/dmasound/dmasound_awacs.c
View file @ 36b8c405
This diff is collapsed.
sound/oss/midibuf.c
View file @ 36b8c405
This diff is collapsed.
sound/oss/soundcard.c
View file @ 36b8c405
This diff is collapsed.
sound/oss/sys_timer.c
View file @ 36b8c405
This diff is collapsed.
sound/oss/uart6850.c
View file @ 36b8c405
This diff is collapsed.
sound/pci/rme9652/hdsp.c
View file @ 36b8c405
This diff is collapsed.
sound/usb/usbaudio.c
View file @ 36b8c405
This diff is collapsed.
usr/Makefile
View file @ 36b8c405
This diff is collapsed.
usr/initramfs_data.scr 0 → 100644
View file @ 36b8c405
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7