From 84d8237d7d91945f87607c8b762dd582c3ff2a4a Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 13 Sep 2005 01:32:25 +0200 Subject: [PATCH] --- yaml --- r: 8911 b: refs/heads/master c: 21d9e30ed020d24336cc3bee2a4e04da232ed554 h: refs/heads/master i: 8909: d72eb52a2418718ae5b6508e5f1d54dc19503c9d 8907: 97aa4285ff8b77fc2ac4496d1b8c81587db6cedd 8903: d4093e592bb277bde6aa8fd9dff2eb8678531180 8895: 315a57113bc8092377042ce13d0802c74ae3e1c0 v: v3 --- [refs] | 2 +- trunk/Documentation/cciss.txt | 4 +- trunk/Documentation/connector/cn_test.c | 194 --- trunk/Documentation/connector/connector.txt | 133 -- trunk/Documentation/dontdiff | 1 - .../feature-removal-schedule.txt | 9 + trunk/Documentation/kdump/kdump.txt | 11 +- trunk/Documentation/oops-tracing.txt | 25 +- trunk/Documentation/pm.txt | 6 - trunk/Documentation/scsi/00-INDEX | 2 - trunk/Documentation/scsi/scsi_eh.txt | 479 -------- .../sound/alsa/ALSA-Configuration.txt | 124 +- .../alsa/DocBook/writing-an-alsa-driver.tmpl | 10 +- trunk/MAINTAINERS | 5 +- trunk/Makefile | 4 +- trunk/arch/arm/mach-pxa/Kconfig | 49 +- trunk/arch/arm/mach-pxa/Makefile | 1 - trunk/arch/arm/mach-pxa/corgi.c | 37 - trunk/arch/arm/mach-pxa/corgi_lcd.c | 197 +-- trunk/arch/arm/mach-pxa/corgi_ssp.c | 66 +- trunk/arch/arm/mach-pxa/sharpsl.h | 34 - trunk/arch/arm/mach-pxa/spitz.c | 380 ------ trunk/arch/i386/kernel/reboot.c | 7 +- trunk/arch/i386/kernel/smpboot.c | 2 +- trunk/arch/i386/kernel/traps.c | 5 +- .../arch/m68knommu/platform/68328/head-de2.S | 135 -- trunk/arch/ppc/kernel/temp.c | 1 + trunk/arch/ppc/kernel/time.c | 1 + trunk/arch/ppc/kernel/vmlinux.lds.S | 4 - trunk/arch/ppc/platforms/chrp_time.c | 1 + trunk/arch/ppc/syslib/prep_nvram.c | 1 + trunk/arch/ppc64/kernel/asm-offsets.c | 1 - trunk/arch/ppc64/kernel/entry.S | 18 +- trunk/arch/ppc64/kernel/pSeries_setup.c | 2 +- trunk/arch/sparc/kernel/module.c | 9 +- trunk/arch/sparc/kernel/sparc_ksyms.c | 31 +- trunk/arch/sparc/lib/mul.S | 2 - trunk/arch/sparc/lib/rem.S | 2 - trunk/arch/sparc/lib/sdiv.S | 2 - trunk/arch/sparc/lib/udiv.S | 2 - trunk/arch/sparc/lib/umul.S | 2 - trunk/arch/sparc/lib/urem.S | 2 - trunk/arch/x86_64/kernel/e820.c | 1 - trunk/arch/x86_64/kernel/mce.c | 2 +- trunk/arch/x86_64/kernel/nmi.c | 8 +- trunk/drivers/Kconfig | 2 - trunk/drivers/Makefile | 2 - trunk/drivers/base/attribute_container.c | 5 +- trunk/drivers/base/class.c | 10 +- trunk/drivers/base/firmware_class.c | 9 +- trunk/drivers/base/map.c | 3 +- trunk/drivers/base/platform.c | 3 +- trunk/drivers/block/cciss.c | 639 ++++------ trunk/drivers/block/cciss.h | 10 +- trunk/drivers/block/cciss_cmd.h | 8 +- trunk/drivers/block/cciss_scsi.c | 69 +- trunk/drivers/block/pktcdvd.c | 85 +- trunk/drivers/block/scsi_ioctl.c | 1 - trunk/drivers/char/amiserial.c | 4 + trunk/drivers/char/watchdog/Kconfig | 102 +- trunk/drivers/char/watchdog/Makefile | 8 +- trunk/drivers/char/watchdog/i6300esb.c | 527 -------- trunk/drivers/char/watchdog/ibmasr.c | 405 ------ trunk/drivers/char/watchdog/mpcore_wdt.c | 434 ------- trunk/drivers/char/watchdog/mv64x60_wdt.c | 252 ---- trunk/drivers/char/watchdog/pcwd_pci.c | 44 +- trunk/drivers/char/watchdog/s3c2410_wdt.c | 2 +- trunk/drivers/char/watchdog/sbc8360.c | 414 ------- trunk/drivers/char/watchdog/w83977f_wdt.c | 543 -------- trunk/drivers/connector/Kconfig | 13 - trunk/drivers/connector/Makefile | 3 - trunk/drivers/connector/cn_queue.c | 173 --- trunk/drivers/connector/connector.c | 486 -------- trunk/drivers/i2c/busses/i2c-keywest.c | 1 + trunk/drivers/ide/ide-iops.c | 41 +- trunk/drivers/ide/pci/cmd64x.c | 2 +- trunk/drivers/ide/pci/hpt34x.c | 2 +- trunk/drivers/ieee1394/sbp2.c | 8 +- trunk/drivers/input/keyboard/Kconfig | 11 - trunk/drivers/input/keyboard/Makefile | 1 - trunk/drivers/input/keyboard/spitzkbd.c | 478 -------- trunk/drivers/input/touchscreen/Kconfig | 6 +- trunk/drivers/input/touchscreen/corgi_ts.c | 70 +- trunk/drivers/isdn/sc/init.c | 4 +- trunk/drivers/media/radio/radio-aimslab.c | 2 +- trunk/drivers/media/radio/radio-aztech.c | 2 +- trunk/drivers/media/radio/radio-cadet.c | 2 +- trunk/drivers/media/radio/radio-gemtek.c | 2 +- trunk/drivers/media/radio/radio-rtrack2.c | 2 +- trunk/drivers/media/radio/radio-sf16fmi.c | 2 +- trunk/drivers/media/radio/radio-sf16fmr2.c | 2 +- trunk/drivers/media/radio/radio-terratec.c | 2 +- trunk/drivers/media/radio/radio-typhoon.c | 2 +- trunk/drivers/media/radio/radio-zoltrix.c | 2 +- trunk/drivers/media/video/cx88/cx88-dvb.c | 7 +- trunk/drivers/mmc/wbsd.c | 441 +++---- trunk/drivers/mmc/wbsd.h | 23 +- trunk/drivers/net/arcnet/com90io.c | 4 +- trunk/drivers/net/bnx2.c | 2 - trunk/drivers/net/hamradio/6pack.c | 2 +- trunk/drivers/net/hamradio/baycom_epp.c | 17 +- trunk/drivers/net/hamradio/bpqether.c | 2 +- trunk/drivers/net/hamradio/dmascc.c | 10 +- trunk/drivers/net/hamradio/hdlcdrv.c | 16 +- trunk/drivers/net/hamradio/mkiss.c | 2 +- trunk/drivers/net/hamradio/scc.c | 2 +- trunk/drivers/net/hamradio/yam.c | 28 +- trunk/drivers/net/tg3.c | 10 +- trunk/drivers/net/wireless/orinoco_cs.c | 1 - trunk/drivers/pcmcia/pcmcia_ioctl.c | 12 - trunk/drivers/sbus/char/bpp.c | 3 +- trunk/drivers/sbus/char/display7seg.c | 2 +- trunk/drivers/sbus/char/vfc_i2c.c | 3 +- trunk/drivers/scsi/3w-9xxx.c | 30 +- trunk/drivers/scsi/Kconfig | 7 - trunk/drivers/scsi/Makefile | 1 - trunk/drivers/scsi/lpfc/lpfc_attr.c | 22 +- trunk/drivers/scsi/lpfc/lpfc_hbadisc.c | 7 +- trunk/drivers/scsi/lpfc/lpfc_hw.h | 17 +- trunk/drivers/scsi/lpfc/lpfc_init.c | 7 +- trunk/drivers/scsi/qla2xxx/qla_attr.c | 18 +- trunk/drivers/scsi/qla2xxx/qla_init.c | 4 +- trunk/drivers/scsi/scsi_lib.c | 138 +-- trunk/drivers/scsi/scsi_priv.h | 1 - trunk/drivers/scsi/scsi_scan.c | 88 +- trunk/drivers/scsi/scsi_sysfs.c | 28 +- trunk/drivers/scsi/scsi_transport_sas.c | 820 ------------- trunk/drivers/scsi/sg.c | 4 +- trunk/drivers/tc/zs.c | 2 +- trunk/drivers/video/Kconfig | 3 +- trunk/drivers/video/backlight/corgi_bl.c | 25 +- trunk/drivers/video/console/fbcon.c | 18 +- trunk/drivers/video/console/fbcon.h | 2 +- trunk/drivers/video/console/font_10x18.c | 4 +- trunk/drivers/video/console/font_6x11.c | 4 +- trunk/drivers/video/console/font_7x14.c | 4 +- trunk/drivers/video/console/font_8x16.c | 4 +- trunk/drivers/video/console/font_8x8.c | 4 +- trunk/drivers/video/console/font_acorn_8x8.c | 4 +- trunk/drivers/video/console/font_mini_4x6.c | 4 +- trunk/drivers/video/console/font_pearl_8x8.c | 4 +- trunk/drivers/video/console/font_sun12x22.c | 4 +- trunk/drivers/video/console/font_sun8x16.c | 4 +- trunk/drivers/video/console/fonts.c | 9 +- trunk/drivers/video/matrox/matroxfb_base.c | 13 +- trunk/drivers/video/pm3fb.c | 3 +- trunk/fs/namei.c | 2 +- trunk/fs/nfsd/nfs4proc.c | 24 +- trunk/fs/nfsd/nfs4state.c | 90 +- trunk/fs/open.c | 98 +- trunk/fs/reiserfs/file.c | 11 +- trunk/fs/reiserfs/inode.c | 16 +- trunk/include/asm-alpha/pgtable.h | 7 + trunk/include/asm-arm/arch-pxa/akita.h | 30 - trunk/include/asm-arm/arch-pxa/corgi.h | 12 + trunk/include/asm-arm/arch-pxa/sharpsl.h | 32 - trunk/include/asm-arm/arch-pxa/spitz.h | 158 --- trunk/include/asm-arm/pgtable.h | 5 +- trunk/include/asm-arm26/pgtable.h | 5 +- trunk/include/asm-frv/pgtable.h | 3 + trunk/include/asm-h8300/pgtable.h | 2 + trunk/include/asm-i386/pgtable.h | 3 + trunk/include/asm-ia64/pgtable.h | 4 + trunk/include/asm-m32r/pgtable.h | 3 + trunk/include/asm-m68k/pgtable.h | 3 + trunk/include/asm-m68knommu/cacheflush.h | 29 +- trunk/include/asm-m68knommu/pgtable.h | 2 + trunk/include/asm-m68knommu/scatterlist.h | 6 - trunk/include/asm-m68knommu/system.h | 54 +- trunk/include/asm-mips/pgtable.h | 12 + trunk/include/asm-parisc/pgtable.h | 3 + trunk/include/asm-ppc/mv64x60.h | 8 - trunk/include/asm-ppc/pgtable.h | 11 + trunk/include/asm-ppc/segment.h | 1 + trunk/include/asm-sh/pgtable.h | 3 + trunk/include/asm-sh64/pgtable.h | 3 + trunk/include/asm-x86_64/pgtable.h | 3 + trunk/include/asm-xtensa/pgtable.h | 6 +- trunk/include/linux/audit.h | 36 +- trunk/include/linux/connector.h | 158 --- trunk/include/linux/fb.h | 2 +- trunk/include/linux/font.h | 10 +- trunk/include/linux/kernel.h | 4 +- trunk/include/linux/netlink.h | 1 - trunk/include/linux/nfsd/xdr4.h | 15 +- trunk/include/linux/pci_ids.h | 48 +- trunk/include/linux/pktcdvd.h | 3 - trunk/include/linux/sched.h | 11 - trunk/include/linux/security.h | 5 - trunk/include/linux/sysctl.h | 3 +- trunk/include/linux/videodev2.h | 109 +- trunk/include/net/ax25.h | 31 +- trunk/include/net/bluetooth/hci.h | 11 + trunk/include/net/netrom.h | 32 +- trunk/include/scsi/scsi_device.h | 4 +- trunk/include/scsi/scsi_transport_fc.h | 8 - trunk/include/scsi/scsi_transport_sas.h | 100 -- trunk/include/sound/core.h | 8 +- trunk/include/sound/cs46xx.h | 14 + trunk/include/sound/emu10k1.h | 7 + trunk/include/sound/pcm.h | 5 +- trunk/include/sound/pcm_oss.h | 3 +- trunk/include/sound/trident.h | 17 + trunk/include/sound/version.h | 2 +- trunk/include/sound/ymfpci.h | 22 + trunk/include/video/pm3fb.h | 3 + trunk/include/video/w100fb.h | 1 - trunk/init/initramfs.c | 12 +- trunk/kernel/audit.c | 128 +- trunk/kernel/auditsc.c | 327 ++--- trunk/kernel/module.c | 11 +- trunk/kernel/sched.c | 8 +- trunk/kernel/timer.c | 9 +- trunk/mm/mempolicy.c | 7 +- trunk/mm/page_alloc.c | 3 +- trunk/mm/vmscan.c | 4 +- trunk/net/ax25/af_ax25.c | 46 +- trunk/net/ax25/ax25_ip.c | 6 +- trunk/net/bluetooth/hci_event.c | 33 + trunk/net/core/pktgen.c | 13 +- trunk/net/dccp/ccids/ccid3.c | 8 - trunk/net/ipv4/ipconfig.c | 6 +- trunk/net/ipv4/netfilter/ip_conntrack_ftp.c | 6 +- trunk/net/ipv4/netfilter/ip_conntrack_irc.c | 6 +- .../ipv4/netfilter/ip_conntrack_netbios_ns.c | 19 +- trunk/net/ipv4/netfilter/ip_conntrack_tftp.c | 6 +- trunk/net/ipv4/netfilter/ipt_MASQUERADE.c | 6 - trunk/net/ipv4/netfilter/ipt_REDIRECT.c | 16 +- trunk/net/irda/ircomm/ircomm_tty.c | 9 +- trunk/net/netrom/af_netrom.c | 28 +- trunk/net/netrom/nr_dev.c | 54 +- trunk/net/netrom/nr_in.c | 15 - trunk/net/netrom/nr_subr.c | 7 +- trunk/net/netrom/sysctl_net_netrom.c | 12 - trunk/net/rose/af_rose.c | 8 +- trunk/net/rose/rose_dev.c | 2 +- trunk/net/sunrpc/svcsock.c | 86 +- trunk/scripts/mod/modpost.c | 6 - trunk/security/Kconfig | 1 - trunk/security/Makefile | 2 +- trunk/security/inode.c | 347 ------ trunk/security/seclvl.c | 228 ++-- trunk/security/selinux/avc.c | 4 +- trunk/security/selinux/hooks.c | 2 +- trunk/security/selinux/ss/services.c | 4 +- trunk/sound/arm/Kconfig | 1 - trunk/sound/arm/aaci.c | 2 - trunk/sound/arm/sa11xx-uda1341.c | 7 +- trunk/sound/core/Kconfig | 14 +- trunk/sound/core/control.c | 12 +- trunk/sound/core/control_compat.c | 8 +- trunk/sound/core/device.c | 2 +- trunk/sound/core/hwdep.c | 2 +- trunk/sound/core/info.c | 8 +- trunk/sound/core/init.c | 187 ++- trunk/sound/core/memalloc.c | 3 +- trunk/sound/core/memory.c | 4 +- trunk/sound/core/oss/mixer_oss.c | 26 +- trunk/sound/core/oss/pcm_oss.c | 17 +- trunk/sound/core/oss/pcm_plugin.c | 2 +- trunk/sound/core/pcm.c | 6 +- trunk/sound/core/pcm_lib.c | 117 +- trunk/sound/core/pcm_memory.c | 4 +- trunk/sound/core/pcm_native.c | 11 +- trunk/sound/core/rawmidi.c | 16 +- trunk/sound/core/seq/instr/ainstr_gf1.c | 2 +- trunk/sound/core/seq/instr/ainstr_iw.c | 6 +- trunk/sound/core/seq/oss/seq_oss_init.c | 2 +- trunk/sound/core/seq/oss/seq_oss_midi.c | 6 +- trunk/sound/core/seq/oss/seq_oss_readq.c | 2 +- trunk/sound/core/seq/oss/seq_oss_synth.c | 4 +- trunk/sound/core/seq/oss/seq_oss_timer.c | 2 +- trunk/sound/core/seq/oss/seq_oss_writeq.c | 2 +- trunk/sound/core/seq/seq.c | 8 +- trunk/sound/core/seq/seq_clientmgr.c | 9 +- trunk/sound/core/seq/seq_device.c | 2 +- trunk/sound/core/seq/seq_dummy.c | 2 +- trunk/sound/core/seq/seq_fifo.c | 2 +- trunk/sound/core/seq/seq_instr.c | 4 +- trunk/sound/core/seq/seq_memory.c | 2 +- trunk/sound/core/seq/seq_midi.c | 2 +- trunk/sound/core/seq/seq_midi_event.c | 2 +- trunk/sound/core/seq/seq_ports.c | 4 +- trunk/sound/core/seq/seq_prioq.c | 2 +- trunk/sound/core/seq/seq_queue.c | 2 +- trunk/sound/core/seq/seq_system.c | 4 +- trunk/sound/core/seq/seq_timer.c | 2 +- trunk/sound/core/seq/seq_virmidi.c | 6 +- trunk/sound/core/sound.c | 15 +- trunk/sound/core/timer.c | 10 +- trunk/sound/drivers/Kconfig | 5 - trunk/sound/drivers/dummy.c | 8 +- trunk/sound/drivers/mpu401/mpu401.c | 26 +- trunk/sound/drivers/mpu401/mpu401_uart.c | 2 +- trunk/sound/drivers/mtpav.c | 5 +- trunk/sound/drivers/opl3/opl3_lib.c | 2 +- trunk/sound/drivers/opl3/opl3_oss.c | 2 +- trunk/sound/drivers/opl4/opl4_lib.c | 2 +- trunk/sound/drivers/serial-u16550.c | 28 +- trunk/sound/drivers/virmidi.c | 4 - trunk/sound/drivers/vx/vx_core.c | 2 +- trunk/sound/drivers/vx/vx_pcm.c | 2 +- trunk/sound/i2c/cs8427.c | 2 +- trunk/sound/i2c/i2c.c | 4 +- trunk/sound/i2c/l3/uda1341.c | 6 +- trunk/sound/i2c/other/ak4114.c | 2 +- trunk/sound/i2c/other/ak4117.c | 2 +- trunk/sound/i2c/tea6330t.c | 2 +- trunk/sound/isa/Kconfig | 18 +- trunk/sound/isa/ad1816a/ad1816a_lib.c | 2 +- trunk/sound/isa/ad1848/ad1848.c | 37 +- trunk/sound/isa/ad1848/ad1848_lib.c | 2 +- trunk/sound/isa/cmi8330.c | 77 +- trunk/sound/isa/cs423x/cs4231.c | 46 +- trunk/sound/isa/cs423x/cs4231_lib.c | 2 +- trunk/sound/isa/cs423x/cs4236.c | 97 +- trunk/sound/isa/es1688/es1688.c | 61 +- trunk/sound/isa/es1688/es1688_lib.c | 2 +- trunk/sound/isa/es18xx.c | 83 +- trunk/sound/isa/gus/gus_main.c | 2 +- trunk/sound/isa/gus/gus_mem_proc.c | 4 +- trunk/sound/isa/gus/gus_pcm.c | 2 +- trunk/sound/isa/gus/gusclassic.c | 115 +- trunk/sound/isa/gus/gusextreme.c | 49 +- trunk/sound/isa/gus/gusmax.c | 145 ++- trunk/sound/isa/gus/interwave.c | 167 +-- trunk/sound/isa/opl3sa2.c | 38 +- trunk/sound/isa/opti9xx/opti92x-ad1848.c | 13 +- trunk/sound/isa/sb/emu8000.c | 2 +- trunk/sound/isa/sb/emu8000_pcm.c | 2 +- trunk/sound/isa/sb/sb16.c | 144 ++- trunk/sound/isa/sb/sb16_csp.c | 2 +- trunk/sound/isa/sb/sb8.c | 62 +- trunk/sound/isa/sb/sb_common.c | 2 +- trunk/sound/isa/sgalaxy.c | 65 +- trunk/sound/isa/sscape.c | 22 +- trunk/sound/isa/wavefront/wavefront.c | 5 - trunk/sound/mips/Kconfig | 1 - trunk/sound/mips/au1x00.c | 5 - trunk/sound/parisc/harmony.c | 2 - trunk/sound/pci/Kconfig | 12 - trunk/sound/pci/Makefile | 2 - trunk/sound/pci/ac97/ac97_codec.c | 5 +- trunk/sound/pci/ac97/ac97_id.h | 1 - trunk/sound/pci/ac97/ac97_patch.c | 24 +- trunk/sound/pci/ac97/ak4531_codec.c | 2 +- trunk/sound/pci/ad1889.c | 1090 ----------------- trunk/sound/pci/ad1889.h | 189 --- trunk/sound/pci/ali5451/ali5451.c | 27 +- trunk/sound/pci/als4000.c | 1 - trunk/sound/pci/atiixp.c | 4 +- trunk/sound/pci/atiixp_modem.c | 3 +- trunk/sound/pci/au88x0/au88x0.c | 29 +- trunk/sound/pci/azt3328.c | 3 +- trunk/sound/pci/bt87x.c | 13 +- trunk/sound/pci/ca0106/ca0106_main.c | 7 +- trunk/sound/pci/ca0106/ca0106_mixer.c | 18 +- trunk/sound/pci/cmipci.c | 29 +- trunk/sound/pci/cs4281.c | 14 +- trunk/sound/pci/cs46xx/cs46xx.c | 1 - trunk/sound/pci/cs46xx/cs46xx_lib.c | 28 +- trunk/sound/pci/emu10k1/emu10k1.c | 1 - trunk/sound/pci/emu10k1/emu10k1_main.c | 7 +- trunk/sound/pci/emu10k1/emu10k1x.c | 7 +- trunk/sound/pci/emu10k1/emufx.c | 20 +- trunk/sound/pci/emu10k1/emupcm.c | 10 +- trunk/sound/pci/emu10k1/p16v.c | 4 +- trunk/sound/pci/ens1370.c | 10 +- trunk/sound/pci/es1938.c | 10 +- trunk/sound/pci/es1968.c | 26 +- trunk/sound/pci/fm801.c | 3 +- trunk/sound/pci/hda/hda_codec.c | 6 +- trunk/sound/pci/hda/hda_codec.h | 1 - trunk/sound/pci/hda/hda_generic.c | 4 +- trunk/sound/pci/hda/hda_intel.c | 93 +- trunk/sound/pci/hda/hda_proc.c | 2 - trunk/sound/pci/hda/patch_analog.c | 6 +- trunk/sound/pci/hda/patch_cmedia.c | 2 +- trunk/sound/pci/hda/patch_realtek.c | 8 +- trunk/sound/pci/hda/patch_si3054.c | 3 +- trunk/sound/pci/hda/patch_sigmatel.c | 4 +- trunk/sound/pci/ice1712/aureon.c | 2 +- trunk/sound/pci/ice1712/ice1712.c | 9 +- trunk/sound/pci/ice1712/ice1724.c | 9 +- trunk/sound/pci/ice1712/juli.c | 2 +- trunk/sound/pci/ice1712/phase.c | 4 +- trunk/sound/pci/ice1712/pontis.c | 2 +- trunk/sound/pci/intel8x0.c | 91 +- trunk/sound/pci/intel8x0m.c | 64 +- trunk/sound/pci/korg1212/korg1212.c | 3 +- trunk/sound/pci/maestro3.c | 32 +- trunk/sound/pci/mixart/mixart.c | 5 +- trunk/sound/pci/nm256/nm256.c | 20 +- trunk/sound/pci/rme32.c | 21 +- trunk/sound/pci/rme96.c | 26 +- trunk/sound/pci/rme9652/hdsp.c | 9 +- trunk/sound/pci/rme9652/hdspm.c | 13 +- trunk/sound/pci/rme9652/rme9652.c | 8 +- trunk/sound/pci/sonicvibes.c | 10 +- trunk/sound/pci/trident/trident.c | 1 - trunk/sound/pci/trident/trident_main.c | 4 +- trunk/sound/pci/via82xx.c | 14 +- trunk/sound/pci/via82xx_modem.c | 3 +- trunk/sound/pci/vx222/vx222.c | 1 - trunk/sound/pci/ymfpci/ymfpci.c | 1 - trunk/sound/pci/ymfpci/ymfpci_main.c | 6 +- trunk/sound/pcmcia/pdaudiocf/pdaudiocf_core.c | 2 +- trunk/sound/ppc/Kconfig | 15 +- trunk/sound/ppc/pmac.c | 3 +- trunk/sound/ppc/powermac.c | 3 - trunk/sound/ppc/tumbler.c | 23 +- trunk/sound/sparc/Kconfig | 3 - trunk/sound/sparc/amd7930.c | 5 +- trunk/sound/sparc/cs4231.c | 7 +- trunk/sound/sparc/dbri.c | 234 ++-- trunk/sound/synth/emux/emux.c | 2 +- trunk/sound/synth/emux/emux_seq.c | 2 +- trunk/sound/synth/emux/soundfont.c | 8 +- trunk/sound/synth/util_mem.c | 2 +- trunk/sound/usb/usbaudio.c | 18 +- trunk/sound/usb/usbmidi.c | 6 +- trunk/sound/usb/usbmixer.c | 10 +- trunk/sound/usb/usx2y/usbusx2yaudio.c | 2 +- 423 files changed, 3512 insertions(+), 12482 deletions(-) delete mode 100644 trunk/Documentation/connector/cn_test.c delete mode 100644 trunk/Documentation/connector/connector.txt delete mode 100644 trunk/Documentation/scsi/scsi_eh.txt delete mode 100644 trunk/arch/arm/mach-pxa/sharpsl.h delete mode 100644 trunk/arch/arm/mach-pxa/spitz.c delete mode 100644 trunk/arch/m68knommu/platform/68328/head-de2.S delete mode 100644 trunk/drivers/char/watchdog/i6300esb.c delete mode 100644 trunk/drivers/char/watchdog/ibmasr.c delete mode 100644 trunk/drivers/char/watchdog/mpcore_wdt.c delete mode 100644 trunk/drivers/char/watchdog/mv64x60_wdt.c delete mode 100644 trunk/drivers/char/watchdog/sbc8360.c delete mode 100644 trunk/drivers/char/watchdog/w83977f_wdt.c delete mode 100644 trunk/drivers/connector/Kconfig delete mode 100644 trunk/drivers/connector/Makefile delete mode 100644 trunk/drivers/connector/cn_queue.c delete mode 100644 trunk/drivers/connector/connector.c delete mode 100644 trunk/drivers/input/keyboard/spitzkbd.c delete mode 100644 trunk/drivers/scsi/scsi_transport_sas.c delete mode 100644 trunk/include/asm-arm/arch-pxa/akita.h delete mode 100644 trunk/include/asm-arm/arch-pxa/sharpsl.h delete mode 100644 trunk/include/asm-arm/arch-pxa/spitz.h create mode 100644 trunk/include/asm-ppc/segment.h delete mode 100644 trunk/include/linux/connector.h delete mode 100644 trunk/include/scsi/scsi_transport_sas.h delete mode 100644 trunk/security/inode.c delete mode 100644 trunk/sound/pci/ad1889.c delete mode 100644 trunk/sound/pci/ad1889.h diff --git a/[refs] b/[refs] index 0cd1e9b70ca6..a33ca0f93fe1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: adcb5ad1e5ba3996d53a047c5486efa6e734b413 +refs/heads/master: 21d9e30ed020d24336cc3bee2a4e04da232ed554 diff --git a/trunk/Documentation/cciss.txt b/trunk/Documentation/cciss.txt index 68a711fb82cf..c8f9a73111da 100644 --- a/trunk/Documentation/cciss.txt +++ b/trunk/Documentation/cciss.txt @@ -17,9 +17,7 @@ This driver is known to work with the following cards: * SA P600 * SA P800 * SA E400 - * SA P400i - * SA E200 - * SA E200i + * SA E300 If nodes are not already created in the /dev/cciss directory, run as root: diff --git a/trunk/Documentation/connector/cn_test.c b/trunk/Documentation/connector/cn_test.c deleted file mode 100644 index b7de82e9c0e0..000000000000 --- a/trunk/Documentation/connector/cn_test.c +++ /dev/null @@ -1,194 +0,0 @@ -/* - * cn_test.c - * - * 2004-2005 Copyright (c) Evgeniy Polyakov - * All rights reserved. - * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include -#include -#include -#include -#include - -#include "connector.h" - -static struct cb_id cn_test_id = { 0x123, 0x456 }; -static char cn_test_name[] = "cn_test"; -static struct sock *nls; -static struct timer_list cn_test_timer; - -void cn_test_callback(void *data) -{ - struct cn_msg *msg = (struct cn_msg *)data; - - printk("%s: %lu: idx=%x, val=%x, seq=%u, ack=%u, len=%d: %s.\n", - __func__, jiffies, msg->id.idx, msg->id.val, - msg->seq, msg->ack, msg->len, (char *)msg->data); -} - -static int cn_test_want_notify(void) -{ - struct cn_ctl_msg *ctl; - struct cn_notify_req *req; - struct cn_msg *msg = NULL; - int size, size0; - struct sk_buff *skb; - struct nlmsghdr *nlh; - u32 group = 1; - - size0 = sizeof(*msg) + sizeof(*ctl) + 3 * sizeof(*req); - - size = NLMSG_SPACE(size0); - - skb = alloc_skb(size, GFP_ATOMIC); - if (!skb) { - printk(KERN_ERR "Failed to allocate new skb with size=%u.\n", - size); - - return -ENOMEM; - } - - nlh = NLMSG_PUT(skb, 0, 0x123, NLMSG_DONE, size - sizeof(*nlh)); - - msg = (struct cn_msg *)NLMSG_DATA(nlh); - - memset(msg, 0, size0); - - msg->id.idx = -1; - msg->id.val = -1; - msg->seq = 0x123; - msg->ack = 0x345; - msg->len = size0 - sizeof(*msg); - - ctl = (struct cn_ctl_msg *)(msg + 1); - - ctl->idx_notify_num = 1; - ctl->val_notify_num = 2; - ctl->group = group; - ctl->len = msg->len - sizeof(*ctl); - - req = (struct cn_notify_req *)(ctl + 1); - - /* - * Idx. - */ - req->first = cn_test_id.idx; - req->range = 10; - - /* - * Val 0. - */ - req++; - req->first = cn_test_id.val; - req->range = 10; - - /* - * Val 1. - */ - req++; - req->first = cn_test_id.val + 20; - req->range = 10; - - NETLINK_CB(skb).dst_groups = ctl->group; - //netlink_broadcast(nls, skb, 0, ctl->group, GFP_ATOMIC); - netlink_unicast(nls, skb, 0, 0); - - printk(KERN_INFO "Request was sent. Group=0x%x.\n", ctl->group); - - return 0; - -nlmsg_failure: - printk(KERN_ERR "Failed to send %u.%u\n", msg->seq, msg->ack); - kfree_skb(skb); - return -EINVAL; -} - -static u32 cn_test_timer_counter; -static void cn_test_timer_func(unsigned long __data) -{ - struct cn_msg *m; - char data[32]; - - m = kmalloc(sizeof(*m) + sizeof(data), GFP_ATOMIC); - if (m) { - memset(m, 0, sizeof(*m) + sizeof(data)); - - memcpy(&m->id, &cn_test_id, sizeof(m->id)); - m->seq = cn_test_timer_counter; - m->len = sizeof(data); - - m->len = - scnprintf(data, sizeof(data), "counter = %u", - cn_test_timer_counter) + 1; - - memcpy(m + 1, data, m->len); - - cn_netlink_send(m, 0, gfp_any()); - kfree(m); - } - - cn_test_timer_counter++; - - mod_timer(&cn_test_timer, jiffies + HZ); -} - -static int cn_test_init(void) -{ - int err; - - err = cn_add_callback(&cn_test_id, cn_test_name, cn_test_callback); - if (err) - goto err_out; - cn_test_id.val++; - err = cn_add_callback(&cn_test_id, cn_test_name, cn_test_callback); - if (err) { - cn_del_callback(&cn_test_id); - goto err_out; - } - - init_timer(&cn_test_timer); - cn_test_timer.function = cn_test_timer_func; - cn_test_timer.expires = jiffies + HZ; - cn_test_timer.data = 0; - add_timer(&cn_test_timer); - - return 0; - - err_out: - if (nls && nls->sk_socket) - sock_release(nls->sk_socket); - - return err; -} - -static void cn_test_fini(void) -{ - del_timer_sync(&cn_test_timer); - cn_del_callback(&cn_test_id); - cn_test_id.val--; - cn_del_callback(&cn_test_id); - if (nls && nls->sk_socket) - sock_release(nls->sk_socket); -} - -module_init(cn_test_init); -module_exit(cn_test_fini); - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Evgeniy Polyakov "); -MODULE_DESCRIPTION("Connector's test module"); diff --git a/trunk/Documentation/connector/connector.txt b/trunk/Documentation/connector/connector.txt deleted file mode 100644 index 54a0a14bfbe3..000000000000 --- a/trunk/Documentation/connector/connector.txt +++ /dev/null @@ -1,133 +0,0 @@ -/*****************************************/ -Kernel Connector. -/*****************************************/ - -Kernel connector - new netlink based userspace <-> kernel space easy -to use communication module. - -Connector driver adds possibility to connect various agents using -netlink based network. One must register callback and -identifier. When driver receives special netlink message with -appropriate identifier, appropriate callback will be called. - -From the userspace point of view it's quite straightforward: - - socket(); - bind(); - send(); - recv(); - -But if kernelspace want to use full power of such connections, driver -writer must create special sockets, must know about struct sk_buff -handling... Connector allows any kernelspace agents to use netlink -based networking for inter-process communication in a significantly -easier way: - -int cn_add_callback(struct cb_id *id, char *name, void (*callback) (void *)); -void cn_netlink_send(struct cn_msg *msg, u32 __group, int gfp_mask); - -struct cb_id -{ - __u32 idx; - __u32 val; -}; - -idx and val are unique identifiers which must be registered in -connector.h for in-kernel usage. void (*callback) (void *) - is a -callback function which will be called when message with above idx.val -will be received by connector core. Argument for that function must -be dereferenced to struct cn_msg *. - -struct cn_msg -{ - struct cb_id id; - - __u32 seq; - __u32 ack; - - __u32 len; /* Length of the following data */ - __u8 data[0]; -}; - -/*****************************************/ -Connector interfaces. -/*****************************************/ - -int cn_add_callback(struct cb_id *id, char *name, void (*callback) (void *)); - -Registers new callback with connector core. - -struct cb_id *id - unique connector's user identifier. - It must be registered in connector.h for legal in-kernel users. -char *name - connector's callback symbolic name. -void (*callback) (void *) - connector's callback. - Argument must be dereferenced to struct cn_msg *. - -void cn_del_callback(struct cb_id *id); - -Unregisters new callback with connector core. - -struct cb_id *id - unique connector's user identifier. - -void cn_netlink_send(struct cn_msg *msg, u32 __groups, int gfp_mask); - -Sends message to the specified groups. It can be safely called from -any context, but may silently fail under strong memory pressure. - -struct cn_msg * - message header(with attached data). -u32 __group - destination group. - If __group is zero, then appropriate group will - be searched through all registered connector users, - and message will be delivered to the group which was - created for user with the same ID as in msg. - If __group is not zero, then message will be delivered - to the specified group. -int gfp_mask - GFP mask. - -Note: When registering new callback user, connector core assigns -netlink group to the user which is equal to it's id.idx. - -/*****************************************/ -Protocol description. -/*****************************************/ - -Current offers transport layer with fixed header. Recommended -protocol which uses such header is following: - -msg->seq and msg->ack are used to determine message genealogy. When -someone sends message it puts there locally unique sequence and random -acknowledge numbers. Sequence number may be copied into -nlmsghdr->nlmsg_seq too. - -Sequence number is incremented with each message to be sent. - -If we expect reply to our message, then sequence number in received -message MUST be the same as in original message, and acknowledge -number MUST be the same + 1. - -If we receive message and it's sequence number is not equal to one we -are expecting, then it is new message. If we receive message and it's -sequence number is the same as one we are expecting, but it's -acknowledge is not equal acknowledge number in original message + 1, -then it is new message. - -Obviously, protocol header contains above id. - -connector allows event notification in the following form: kernel -driver or userspace process can ask connector to notify it when -selected id's will be turned on or off(registered or unregistered it's -callback). It is done by sending special command to connector -driver(it also registers itself with id={-1, -1}). - -As example of usage Documentation/connector now contains cn_test.c - -testing module which uses connector to request notification and to -send messages. - -/*****************************************/ -Reliability. -/*****************************************/ - -Netlink itself is not reliable protocol, that means that messages can -be lost due to memory pressure or process' receiving queue overflowed, -so caller is warned must be prepared. That is why struct cn_msg [main -connector's message header] contains u32 seq and u32 ack fields. diff --git a/trunk/Documentation/dontdiff b/trunk/Documentation/dontdiff index 24adfe9af3ca..96bea278bbf6 100644 --- a/trunk/Documentation/dontdiff +++ b/trunk/Documentation/dontdiff @@ -55,7 +55,6 @@ aic7*seq.h* aicasm aicdb.h* asm -asm-offsets.* asm_offsets.* autoconf.h* bbootsect diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index b67189a8d8d4..784e08c1c80a 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -17,6 +17,15 @@ Who: Greg Kroah-Hartman --------------------------- +What: io_remap_page_range() (macro or function) +When: September 2005 +Why: Replaced by io_remap_pfn_range() which allows more memory space + addressabilty (by using a pfn) and supports sparc & sparc64 + iospace as part of the pfn. +Who: Randy Dunlap + +--------------------------- + What: RAW driver (CONFIG_RAW_DRIVER) When: December 2005 Why: declared obsolete since kernel 2.6.3 diff --git a/trunk/Documentation/kdump/kdump.txt b/trunk/Documentation/kdump/kdump.txt index 5f08f9ce6046..1f5f7d28c9e6 100644 --- a/trunk/Documentation/kdump/kdump.txt +++ b/trunk/Documentation/kdump/kdump.txt @@ -66,11 +66,11 @@ SETUP c) Enable "/proc/vmcore support" (Optional, in Pseudo filesystems). CONFIG_PROC_VMCORE=y d) Disable SMP support and build a UP kernel (Until it is fixed). - CONFIG_SMP=n + CONFIG_SMP=n e) Enable "Local APIC support on uniprocessors". - CONFIG_X86_UP_APIC=y + CONFIG_X86_UP_APIC=y f) Enable "IO-APIC support on uniprocessors" - CONFIG_X86_UP_IOAPIC=y + CONFIG_X86_UP_IOAPIC=y Note: i) Options a) and b) depend upon "Configure standard kernel features (for small systems)" (under General setup). @@ -95,11 +95,6 @@ SETUP hence have memory less than 4GB. iii) Specify "irqpoll" as command line parameter. This reduces driver initialization failures in second kernel due to shared interrupts. - iv) needs to be specified in a format corresponding to - the root device name in the output of mount command. - v) If you have built the drivers required to mount root file - system as modules in , then, specify - --initrd=. 5) System reboots into the second kernel when a panic occurs. A module can be written to force the panic or "ALT-SysRq-c" can be used initiate a crash diff --git a/trunk/Documentation/oops-tracing.txt b/trunk/Documentation/oops-tracing.txt index 66eaaab7773d..da711028e5f7 100644 --- a/trunk/Documentation/oops-tracing.txt +++ b/trunk/Documentation/oops-tracing.txt @@ -205,8 +205,8 @@ Phone: 701-234-7556 Tainted kernels: Some oops reports contain the string 'Tainted: ' after the program -counter. This indicates that the kernel has been tainted by some -mechanism. The string is followed by a series of position-sensitive +counter, this indicates that the kernel has been tainted by some +mechanism. The string is followed by a series of position sensitive characters, each representing a particular tainted value. 1: 'G' if all modules loaded have a GPL or compatible license, 'P' if @@ -214,25 +214,16 @@ characters, each representing a particular tainted value. MODULE_LICENSE or with a MODULE_LICENSE that is not recognised by insmod as GPL compatible are assumed to be proprietary. - 2: 'F' if any module was force loaded by "insmod -f", ' ' if all + 2: 'F' if any module was force loaded by insmod -f, ' ' if all modules were loaded normally. 3: 'S' if the oops occurred on an SMP kernel running on hardware that - hasn't been certified as safe to run multiprocessor. - Currently this occurs only on various Athlons that are not - SMP capable. - - 4: 'R' if a module was force unloaded by "rmmod -f", ' ' if all - modules were unloaded normally. - - 5: 'M' if any processor has reported a Machine Check Exception, - ' ' if no Machine Check Exceptions have occurred. - - 6: 'B' if a page-release function has found a bad page reference or - some unexpected page flags. + hasn't been certified as safe to run multiprocessor. + Currently this occurs only on various Athlons that are not + SMP capable. The primary reason for the 'Tainted: ' string is to tell kernel debuggers if this is a clean kernel or if anything unusual has -occurred. Tainting is permanent: even if an offending module is -unloaded, the tainted value remains to indicate that the kernel is not +occurred. Tainting is permanent, even if an offending module is +unloading the tainted value remains to indicate that the kernel is not trustworthy. diff --git a/trunk/Documentation/pm.txt b/trunk/Documentation/pm.txt index 2ea1149bf6b0..cc63ae18d147 100644 --- a/trunk/Documentation/pm.txt +++ b/trunk/Documentation/pm.txt @@ -38,12 +38,6 @@ system the associated daemon will exit gracefully. Driver Interface -- OBSOLETE, DO NOT USE! ----------------************************* - -Note: pm_register(), pm_access(), pm_dev_idle() and friends are -obsolete. Please do not use them. Instead you should properly hook -your driver into the driver model, and use its suspend()/resume() -callbacks to do this kind of stuff. - If you are writing a new driver or maintaining an old driver, it should include power management support. Without power management support, a single driver may prevent a system with power management diff --git a/trunk/Documentation/scsi/00-INDEX b/trunk/Documentation/scsi/00-INDEX index fef92ebf266f..f9cb5bdcce41 100644 --- a/trunk/Documentation/scsi/00-INDEX +++ b/trunk/Documentation/scsi/00-INDEX @@ -60,8 +60,6 @@ scsi.txt - short blurb on using SCSI support as a module. scsi_mid_low_api.txt - info on API between SCSI layer and low level drivers -scsi_eh.txt - - info on SCSI midlayer error handling infrastructure st.txt - info on scsi tape driver sym53c500_cs.txt diff --git a/trunk/Documentation/scsi/scsi_eh.txt b/trunk/Documentation/scsi/scsi_eh.txt deleted file mode 100644 index 534a50922a7b..000000000000 --- a/trunk/Documentation/scsi/scsi_eh.txt +++ /dev/null @@ -1,479 +0,0 @@ - -SCSI EH -====================================== - - This document describes SCSI midlayer error handling infrastructure. -Please refer to Documentation/scsi/scsi_mid_low_api.txt for more -information regarding SCSI midlayer. - -TABLE OF CONTENTS - -[1] How SCSI commands travel through the midlayer and to EH - [1-1] struct scsi_cmnd - [1-2] How do scmd's get completed? - [1-2-1] Completing a scmd w/ scsi_done - [1-2-2] Completing a scmd w/ timeout - [1-3] How EH takes over -[2] How SCSI EH works - [2-1] EH through fine-grained callbacks - [2-1-1] Overview - [2-1-2] Flow of scmds through EH - [2-1-3] Flow of control - [2-2] EH through hostt->eh_strategy_handler() - [2-2-1] Pre hostt->eh_strategy_handler() SCSI midlayer conditions - [2-2-2] Post hostt->eh_strategy_handler() SCSI midlayer conditions - [2-2-3] Things to consider - - -[1] How SCSI commands travel through the midlayer and to EH - -[1-1] struct scsi_cmnd - - Each SCSI command is represented with struct scsi_cmnd (== scmd). A -scmd has two list_head's to link itself into lists. The two are -scmd->list and scmd->eh_entry. The former is used for free list or -per-device allocated scmd list and not of much interest to this EH -discussion. The latter is used for completion and EH lists and unless -otherwise stated scmds are always linked using scmd->eh_entry in this -discussion. - - -[1-2] How do scmd's get completed? - - Once LLDD gets hold of a scmd, either the LLDD will complete the -command by calling scsi_done callback passed from midlayer when -invoking hostt->queuecommand() or SCSI midlayer will time it out. - - -[1-2-1] Completing a scmd w/ scsi_done - - For all non-EH commands, scsi_done() is the completion callback. It -does the following. - - 1. Delete timeout timer. If it fails, it means that timeout timer - has expired and is going to finish the command. Just return. - - 2. Link scmd to per-cpu scsi_done_q using scmd->en_entry - - 3. Raise SCSI_SOFTIRQ - - SCSI_SOFTIRQ handler scsi_softirq calls scsi_decide_disposition() to -determine what to do with the command. scsi_decide_disposition() -looks at the scmd->result value and sense data to determine what to do -with the command. - - - SUCCESS - scsi_finish_command() is invoked for the command. The - function does some maintenance choirs and notify completion by - calling scmd->done() callback, which, for fs requests, would - be HLD completion callback - sd:sd_rw_intr, sr:rw_intr, - st:st_intr. - - - NEEDS_RETRY - - ADD_TO_MLQUEUE - scmd is requeued to blk queue. - - - otherwise - scsi_eh_scmd_add(scmd, 0) is invoked for the command. See - [1-3] for details of this funciton. - - -[1-2-2] Completing a scmd w/ timeout - - The timeout handler is scsi_times_out(). When a timeout occurs, this -function - - 1. invokes optional hostt->eh_timedout() callback. Return value can - be one of - - - EH_HANDLED - This indicates that eh_timedout() dealt with the timeout. The - scmd is passed to __scsi_done() and thus linked into per-cpu - scsi_done_q. Normal command completion described in [1-2-1] - follows. - - - EH_RESET_TIMER - This indicates that more time is required to finish the - command. Timer is restarted. This action is counted as a - retry and only allowed scmd->allowed + 1(!) times. Once the - limit is reached, action for EH_NOT_HANDLED is taken instead. - - *NOTE* This action is racy as the LLDD could finish the scmd - after the timeout has expired but before it's added back. In - such cases, scsi_done() would think that timeout has occurred - and return without doing anything. We lose completion and the - command will time out again. - - - EH_NOT_HANDLED - This is the same as when eh_timedout() callback doesn't exist. - Step #2 is taken. - - 2. scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD) is invoked for the - command. See [1-3] for more information. - - -[1-3] How EH takes over - - scmds enter EH via scsi_eh_scmd_add(), which does the following. - - 1. Turns on scmd->eh_eflags as requested. It's 0 for error - completions and SCSI_EH_CANCEL_CMD for timeouts. - - 2. Links scmd->eh_entry to shost->eh_cmd_q - - 3. Sets SHOST_RECOVERY bit in shost->shost_state - - 4. Increments shost->host_failed - - 5. Wakes up SCSI EH thread if shost->host_busy == shost->host_failed - - As can be seen above, once any scmd is added to shost->eh_cmd_q, -SHOST_RECOVERY shost_state bit is turned on. This prevents any new -scmd to be issued from blk queue to the host; eventually, all scmds on -the host either complete normally, fail and get added to eh_cmd_q, or -time out and get added to shost->eh_cmd_q. - - If all scmds either complete or fail, the number of in-flight scmds -becomes equal to the number of failed scmds - i.e. shost->host_busy == -shost->host_failed. This wakes up SCSI EH thread. So, once woken up, -SCSI EH thread can expect that all in-flight commands have failed and -are linked on shost->eh_cmd_q. - - Note that this does not mean lower layers are quiescent. If a LLDD -completed a scmd with error status, the LLDD and lower layers are -assumed to forget about the scmd at that point. However, if a scmd -has timed out, unless hostt->eh_timedout() made lower layers forget -about the scmd, which currently no LLDD does, the command is still -active as long as lower layers are concerned and completion could -occur at any time. Of course, all such completions are ignored as the -timer has already expired. - - We'll talk about how SCSI EH takes actions to abort - make LLDD -forget about - timed out scmds later. - - -[2] How SCSI EH works - - LLDD's can implement SCSI EH actions in one of the following two -ways. - - - Fine-grained EH callbacks - LLDD can implement fine-grained EH callbacks and let SCSI - midlayer drive error handling and call appropriate callbacks. - This will be dicussed further in [2-1]. - - - eh_strategy_handler() callback - This is one big callback which should perform whole error - handling. As such, it should do all choirs SCSI midlayer - performs during recovery. This will be discussed in [2-2]. - - Once recovery is complete, SCSI EH resumes normal operation by -calling scsi_restart_operations(), which - - 1. Checks if door locking is needed and locks door. - - 2. Clears SHOST_RECOVERY shost_state bit - - 3. Wakes up waiters on shost->host_wait. This occurs if someone - calls scsi_block_when_processing_errors() on the host. - (*QUESTION* why is it needed? All operations will be blocked - anyway after it reaches blk queue.) - - 4. Kicks queues in all devices on the host in the asses - - -[2-1] EH through fine-grained callbacks - -[2-1-1] Overview - - If eh_strategy_handler() is not present, SCSI midlayer takes charge -of driving error handling. EH's goals are two - make LLDD, host and -device forget about timed out scmds and make them ready for new -commands. A scmd is said to be recovered if the scmd is forgotten by -lower layers and lower layers are ready to process or fail the scmd -again. - - To achieve these goals, EH performs recovery actions with increasing -severity. Some actions are performed by issueing SCSI commands and -others are performed by invoking one of the following fine-grained -hostt EH callbacks. Callbacks may be omitted and omitted ones are -considered to fail always. - -int (* eh_abort_handler)(struct scsi_cmnd *); -int (* eh_device_reset_handler)(struct scsi_cmnd *); -int (* eh_bus_reset_handler)(struct scsi_cmnd *); -int (* eh_host_reset_handler)(struct scsi_cmnd *); - - Higher-severity actions are taken only when lower-severity actions -cannot recover some of failed scmds. Also, note that failure of the -highest-severity action means EH failure and results in offlining of -all unrecovered devices. - - During recovery, the following rules are followed - - - Recovery actions are performed on failed scmds on the to do list, - eh_work_q. If a recovery action succeeds for a scmd, recovered - scmds are removed from eh_work_q. - - Note that single recovery action on a scmd can recover multiple - scmds. e.g. resetting a device recovers all failed scmds on the - device. - - - Higher severity actions are taken iff eh_work_q is not empty after - lower severity actions are complete. - - - EH reuses failed scmds to issue commands for recovery. For - timed-out scmds, SCSI EH ensures that LLDD forgets about a scmd - before reusing it for EH commands. - - When a scmd is recovered, the scmd is moved from eh_work_q to EH -local eh_done_q using scsi_eh_finish_cmd(). After all scmds are -recovered (eh_work_q is empty), scsi_eh_flush_done_q() is invoked to -either retry or error-finish (notify upper layer of failure) recovered -scmds. - - scmds are retried iff its sdev is still online (not offlined during -EH), REQ_FAILFAST is not set and ++scmd->retries is less than -scmd->allowed. - - -[2-1-2] Flow of scmds through EH - - 1. Error completion / time out - ACTION: scsi_eh_scmd_add() is invoked for scmd - - set scmd->eh_eflags - - add scmd to shost->eh_cmd_q - - set SHOST_RECOVERY - - shost->host_failed++ - LOCKING: shost->host_lock - - 2. EH starts - ACTION: move all scmds to EH's local eh_work_q. shost->eh_cmd_q - is cleared. - LOCKING: shost->host_lock (not strictly necessary, just for - consistency) - - 3. scmd recovered - ACTION: scsi_eh_finish_cmd() is invoked to EH-finish scmd - - shost->host_failed-- - - clear scmd->eh_eflags - - scsi_setup_cmd_retry() - - move from local eh_work_q to local eh_done_q - LOCKING: none - - 4. EH completes - ACTION: scsi_eh_flush_done_q() retries scmds or notifies upper - layer of failure. - - scmd is removed from eh_done_q and scmd->eh_entry is cleared - - if retry is necessary, scmd is requeued using - scsi_queue_insert() - - otherwise, scsi_finish_command() is invoked for scmd - LOCKING: queue or finish function performs appropriate locking - - -[2-1-3] Flow of control - - EH through fine-grained callbacks start from scsi_unjam_host(). - -<> - - 1. Lock shost->host_lock, splice_init shost->eh_cmd_q into local - eh_work_q and unlock host_lock. Note that shost->eh_cmd_q is - cleared by this action. - - 2. Invoke scsi_eh_get_sense. - - <> - - This action is taken for each error-completed - (!SCSI_EH_CANCEL_CMD) commands without valid sense data. Most - SCSI transports/LLDDs automatically acquire sense data on - command failures (autosense). Autosense is recommended for - performance reasons and as sense information could get out of - sync inbetween occurrence of CHECK CONDITION and this action. - - Note that if autosense is not supported, scmd->sense_buffer - contains invalid sense data when error-completing the scmd - with scsi_done(). scsi_decide_disposition() always returns - FAILED in such cases thus invoking SCSI EH. When the scmd - reaches here, sense data is acquired and - scsi_decide_disposition() is called again. - - 1. Invoke scsi_request_sense() which issues REQUEST_SENSE - command. If fails, no action. Note that taking no action - causes higher-severity recovery to be taken for the scmd. - - 2. Invoke scsi_decide_disposition() on the scmd - - - SUCCESS - scmd->retries is set to scmd->allowed preventing - scsi_eh_flush_done_q() from retrying the scmd and - scsi_eh_finish_cmd() is invoked. - - - NEEDS_RETRY - scsi_eh_finish_cmd() invoked - - - otherwise - No action. - - 3. If !list_empty(&eh_work_q), invoke scsi_eh_abort_cmds(). - - <> - - This action is taken for each timed out command. - hostt->eh_abort_handler() is invoked for each scmd. The - handler returns SUCCESS if it has succeeded to make LLDD and - all related hardware forget about the scmd. - - If a timedout scmd is successfully aborted and the sdev is - either offline or ready, scsi_eh_finish_cmd() is invoked for - the scmd. Otherwise, the scmd is left in eh_work_q for - higher-severity actions. - - Note that both offline and ready status mean that the sdev is - ready to process new scmds, where processing also implies - immediate failing; thus, if a sdev is in one of the two - states, no further recovery action is needed. - - Device readiness is tested using scsi_eh_tur() which issues - TEST_UNIT_READY command. Note that the scmd must have been - aborted successfully before reusing it for TEST_UNIT_READY. - - 4. If !list_empty(&eh_work_q), invoke scsi_eh_ready_devs() - - <> - - This function takes four increasingly more severe measures to - make failed sdevs ready for new commands. - - 1. Invoke scsi_eh_stu() - - <> - - For each sdev which has failed scmds with valid sense data - of which scsi_check_sense()'s verdict is FAILED, - START_STOP_UNIT command is issued w/ start=1. Note that - as we explicitly choose error-completed scmds, it is known - that lower layers have forgotten about the scmd and we can - reuse it for STU. - - If STU succeeds and the sdev is either offline or ready, - all failed scmds on the sdev are EH-finished with - scsi_eh_finish_cmd(). - - *NOTE* If hostt->eh_abort_handler() isn't implemented or - failed, we may still have timed out scmds at this point - and STU doesn't make lower layers forget about those - scmds. Yet, this function EH-finish all scmds on the sdev - if STU succeeds leaving lower layers in an inconsistent - state. It seems that STU action should be taken only when - a sdev has no timed out scmd. - - 2. If !list_empty(&eh_work_q), invoke scsi_eh_bus_device_reset(). - - <> - - This action is very similar to scsi_eh_stu() except that, - instead of issuing STU, hostt->eh_device_reset_handler() - is used. Also, as we're not issuing SCSI commands and - resetting clears all scmds on the sdev, there is no need - to choose error-completed scmds. - - 3. If !list_empty(&eh_work_q), invoke scsi_eh_bus_reset() - - <> - - hostt->eh_bus_reset_handler() is invoked for each channel - with failed scmds. If bus reset succeeds, all failed - scmds on all ready or offline sdevs on the channel are - EH-finished. - - 4. If !list_empty(&eh_work_q), invoke scsi_eh_host_reset() - - <> - - This is the last resort. hostt->eh_host_reset_handler() - is invoked. If host reset succeeds, all failed scmds on - all ready or offline sdevs on the host are EH-finished. - - 5. If !list_empty(&eh_work_q), invoke scsi_eh_offline_sdevs() - - <> - - Take all sdevs which still have unrecovered scmds offline - and EH-finish the scmds. - - 5. Invoke scsi_eh_flush_done_q(). - - <> - - At this point all scmds are recovered (or given up) and - put on eh_done_q by scsi_eh_finish_cmd(). This function - flushes eh_done_q by either retrying or notifying upper - layer of failure of the scmds. - - -[2-2] EH through hostt->eh_strategy_handler() - - hostt->eh_strategy_handler() is invoked in the place of -scsi_unjam_host() and it is responsible for whole recovery process. -On completion, the handler should have made lower layers forget about -all failed scmds and either ready for new commands or offline. Also, -it should perform SCSI EH maintenance choirs to maintain integrity of -SCSI midlayer. IOW, of the steps described in [2-1-2], all steps -except for #1 must be implemented by eh_strategy_handler(). - - -[2-2-1] Pre hostt->eh_strategy_handler() SCSI midlayer conditions - - The following conditions are true on entry to the handler. - - - Each failed scmd's eh_flags field is set appropriately. - - - Each failed scmd is linked on scmd->eh_cmd_q by scmd->eh_entry. - - - SHOST_RECOVERY is set. - - - shost->host_failed == shost->host_busy - - -[2-2-2] Post hostt->eh_strategy_handler() SCSI midlayer conditions - - The following conditions must be true on exit from the handler. - - - shost->host_failed is zero. - - - Each scmd's eh_eflags field is cleared. - - - Each scmd is in such a state that scsi_setup_cmd_retry() on the - scmd doesn't make any difference. - - - shost->eh_cmd_q is cleared. - - - Each scmd->eh_entry is cleared. - - - Either scsi_queue_insert() or scsi_finish_command() is called on - each scmd. Note that the handler is free to use scmd->retries and - ->allowed to limit the number of retries. - - -[2-2-3] Things to consider - - - Know that timed out scmds are still active on lower layers. Make - lower layers forget about them before doing anything else with - those scmds. - - - For consistency, when accessing/modifying shost data structure, - grab shost->host_lock. - - - On completion, each failed sdev must have forgotten about all - active scmds. - - - On completion, each failed sdev must be ready for new commands or - offline. - - --- -Tejun Heo -htejun@gmail.com -11th September 2005 diff --git a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt index 13cba955cb5a..ebfcdf28485f 100644 --- a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt @@ -75,7 +75,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. adsp_map - PCM device number maps assigned to the 2st OSS device. - Default: 1 nonblock_open - - Don't block opening busy PCM devices. Default: 1 + - Don't block opening busy PCM devices. For example, when dsp_map=2, /dev/dsp will be mapped to PCM #2 of the card #0. Similarly, when adsp_map=0, /dev/adsp will be mapped @@ -148,16 +148,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. Module supports up to 8 cards. This module does not support autoprobe thus main port must be specified!!! Other ports are optional. - Module snd-ad1889 - ----------------- - - Module for Analog Devices AD1889 chips. - - ac97_quirk - AC'97 workaround for strange hardware - See the description of intel8x0 module for details. - - This module supports up to 8 cards. - Module snd-ali5451 ------------------ @@ -199,20 +189,15 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. Module snd-atiixp ----------------- - Module for ATI IXP 150/200/250/400 AC97 controllers. + Module for ATI IXP 150/200/250 AC97 controllers. - ac97_clock - AC'97 clock (default = 48000) + ac97_clock - AC'97 clock (defalut = 48000) ac97_quirk - AC'97 workaround for strange hardware - See "AC97 Quirk Option" section below. + See the description of intel8x0 module for details. spdif_aclink - S/PDIF transfer over AC-link (default = 1) This module supports up to 8 cards and autoprobe. - ATI IXP has two different methods to control SPDIF output. One is - over AC-link and another is over the "direct" SPDIF output. The - implementation depends on the motherboard, and you'll need to - choose the correct one via spdif_aclink module option. - Module snd-atiixp-modem ----------------------- @@ -245,7 +230,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. The hardware EQ hardware and SPDIF is only present in the Vortex2 and Advantage. - Note: Some ALSA mixer applications don't handle the SPDIF sample rate + Note: Some ALSA mixer applicactions don't handle the SPDIF samplerate control correctly. If you have problems regarding this, try another ALSA compliant mixer (alsamixer works). @@ -317,7 +302,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. mpu_port - 0x300,0x310,0x320,0x330, 0 = disable (default) fm_port - 0x388 (default), 0 = disable (default) - soft_ac3 - Software-conversion of raw SPDIF packets (model 033 only) + soft_ac3 - Sofware-conversion of raw SPDIF packets (model 033 only) (default = 1) joystick_port - Joystick port address (0 = disable, 1 = auto-detect) @@ -399,7 +384,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. Module for PCI sound cards based on CS4610/CS4612/CS4614/CS4615/CS4622/ CS4624/CS4630/CS4280 PCI chips. - external_amp - Force to enable external amplifier. + external_amp - Force to enable external amplifer. thinkpad - Force to enable Thinkpad's CLKRUN control. mmap_valid - Support OSS mmap mode (default = 0). @@ -635,7 +620,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. VIA VT8251/VT8237A model - force the model name - position_fix - Fix DMA pointer (0 = auto, 1 = none, 2 = POSBUF, 3 = FIFO size) + position_fix - Fix DMA pointer (0 = FIFO size, 1 = none, 2 = POSBUF) Module supports up to 8 cards. @@ -671,11 +656,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. allout 5-jack in back, 2-jack in front, SPDIF out auto auto-config reading BIOS (default) - If the default configuration doesn't work and one of the above - matches with your device, report it together with the PCI - subsystem ID (output of "lspci -nv") to ALSA BTS or alsa-devel - ML (see the section "Links and Addresses"). - Note 2: If you get click noises on output, try the module option position_fix=1 or 2. position_fix=1 will use the SD_LPIB register value without FIFO size correction as the current @@ -803,13 +783,20 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. ac97_clock - AC'97 codec clock base (0 = auto-detect) ac97_quirk - AC'97 workaround for strange hardware - See "AC97 Quirk Option" section below. + The following strings are accepted: + default = don't override the default setting + disable = disable the quirk + hp_only = use headphone control as master + swap_hp = swap headphone and master controls + swap_surround = swap master and surround controls + ad_sharing = for AD1985, turn on OMS bit and use headphone + alc_jack = for ALC65x, turn on the jack sense mode + inv_eapd = inverted EAPD implementation + mute_led = bind EAPD bit for turning on/off mute LED + For backward compatibility, the corresponding integer + value -1, 0, ... are accepted, too. buggy_irq - Enable workaround for buggy interrupts on some - motherboards (default yes on nForce chips, - otherwise off) - buggy_semaphore - Enable workaround for hardwares with buggy - semaphores (e.g. on some ASUS laptops) - (default off) + motherboards (default off) Module supports autoprobe and multiple bus-master chips (max 8). @@ -821,6 +808,13 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. motherboard has these devices, use the ns558 or snd-mpu401 modules, respectively. + The ac97_quirk option is used to enable/override the workaround + for specific devices. Some hardware have swapped output pins + between Master and Headphone, or Surround. The driver provides + the auto-detection of known problematic devices, but some might + be unknown or wrongly detected. In such a case, pass the proper + value with this option. + The power-management is supported. Module snd-intel8x0m @@ -972,7 +966,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. with machines with other (most likely CS423x or OPL3SAx) chips, even though the device is detected in lspci. In such a case, try other drivers, e.g. snd-cs4232 or snd-opl3sa2. Some has ISA-PnP - but some doesn't have ISA PnP. You'll need to specify isapnp=0 + but some doesn't have ISA PnP. You'll need to speicfy isapnp=0 and proper hardware parameters in the case without ISA PnP. Note: some laptops need a workaround for AC97 RESET. For the @@ -1308,7 +1302,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. channels [VIA8233/C, 8235, 8237 only] ac97_quirk - AC'97 workaround for strange hardware - See "AC97 Quirk Option" section below. + See the description of intel8x0 module for details. Module supports autoprobe and multiple bus-master chips (max 8). @@ -1333,17 +1327,16 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. "lspci -nv"). If dxs_support=5 does not work, try dxs_support=4; if it doesn't work too, try dxs_support=1. (dxs_support=1 is - usually for old motherboards. The correct implemented + usually for old motherboards. The correct implementated board should work with 4 or 5.) If it still doesn't work and the default setting is ok, dxs_support=3 is the right choice. If the default setting doesn't work at all, try dxs_support=2 to disable the DXS channels. In any cases, please let us know the result and the - subsystem vendor/device ids. See "Links and Addresses" - below. + subsystem vendor/device ids. Note: for the MPU401 on VIA823x, use snd-mpu401 driver - additionally. The mpu_port option is for VIA686 chips only. + additonally. The mpu_port option is for VIA686 chips only. Module snd-via82xx-modem ------------------------ @@ -1405,10 +1398,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. Module supports up to 8 cards. The module is compiled only when PCMCIA is supported on kernel. - With the older 2.6.x kernel, to activate the driver via the card - manager, you'll need to set up /etc/pcmcia/vxpocket.conf. See the - sound/pcmcia/vx/vxpocket.c. 2.6.13 or later kernel requires no - longer require a config file. + To activate the driver via the card manager, you'll need to set + up /etc/pcmcia/vxpocket.conf. See the sound/pcmcia/vx/vxpocket.c. When the driver is compiled as a module and the hotplug firmware is supported, the firmware data is loaded via hotplug automatically. @@ -1420,9 +1411,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. Note: the driver is build only when CONFIG_ISA is set. - Note2: snd-vxp440 driver is merged to snd-vxpocket driver since - ALSA 1.0.10. - Module snd-ymfpci ----------------- @@ -1448,37 +1436,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. Note: the driver is build only when CONFIG_ISA is set. -AC97 Quirk Option -================= - -The ac97_quirk option is used to enable/override the workaround for -specific devices on drivers for on-board AC'97 controllers like -snd-intel8x0. Some hardware have swapped output pins between Master -and Headphone, or Surround (thanks to confusion of AC'97 -specifications from version to version :-) - -The driver provides the auto-detection of known problematic devices, -but some might be unknown or wrongly detected. In such a case, pass -the proper value with this option. - -The following strings are accepted: - - default Don't override the default setting - - disable Disable the quirk - - hp_only Bind Master and Headphone controls as a single control - - swap_hp Swap headphone and master controls - - swap_surround Swap master and surround controls - - ad_sharing For AD1985, turn on OMS bit and use headphone - - alc_jack For ALC65x, turn on the jack sense mode - - inv_eapd Inverted EAPD implementation - - mute_led Bind EAPD bit for turning on/off mute LED - -For backward compatibility, the corresponding integer value -1, 0, -... are accepted, too. - -For example, if "Master" volume control has no effect on your device -but only "Headphone" does, pass ac97_quirk=hp_only module option. - - Configuring Non-ISAPNP Cards ============================ @@ -1596,8 +1553,6 @@ Proc interfaces (/proc/asound) - whole-frag write only whole fragments (optimization affecting playback only) - no-silence do not fill silence ahead to avoid clicks - - buggy-ptr Returns the whitespace blocks in GETOPTR ioctl - instead of filled blocks Example: echo "x11amp 128 16384" > /proc/asound/card0/pcm0p/oss echo "squake 0 0 disable" > /proc/asound/card0/pcm0c/oss @@ -1634,14 +1589,9 @@ commands to the snd-page-alloc driver: use. -Links and Addresses -=================== +Links +===== ALSA project homepage http://www.alsa-project.org - ALSA Bug Tracking System - https://bugtrack.alsa-project.org/bugs/ - - ALSA Developers ML - mailto:alsa-devel@lists.sourceforge.net diff --git a/trunk/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/trunk/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl index 24e85520890b..0475478c2484 100644 --- a/trunk/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl +++ b/trunk/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl @@ -447,7 +447,7 @@ .... /* allocate a chip-specific data with zero filled */ - chip = kzalloc(sizeof(*chip), GFP_KERNEL); + chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); if (chip == NULL) return -ENOMEM; @@ -949,7 +949,7 @@ After allocating a card instance via snd_card_new() (with NULL on the 4th arg), call - kzalloc(). + kcalloc(). @@ -958,7 +958,7 @@ mychip_t *chip; card = snd_card_new(index[dev], id[dev], THIS_MODULE, NULL); ..... - chip = kzalloc(sizeof(*chip), GFP_KERNEL); + chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); ]]> @@ -1136,7 +1136,7 @@ return -ENXIO; } - chip = kzalloc(sizeof(*chip), GFP_KERNEL); + chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); if (chip == NULL) { pci_disable_device(pci); return -ENOMEM; @@ -1292,7 +1292,7 @@ need to initialize this number as -1 before actual allocation, since irq 0 is valid. The port address and its resource pointer can be initialized as null by - kzalloc() automatically, so you + kcalloc() automatically, so you don't have to take care of resetting them. diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index d1e0eb46d201..a67bf7d315d7 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -370,10 +370,7 @@ W: http://atmelwlandriver.sourceforge.net/ S: Maintained AUDIT SUBSYSTEM -P: David Woodhouse -M: dwmw2@infradead.org -L: linux-audit@redhat.com -W: http://people.redhat.com/sgrubb/audit/ +L: linux-audit@redhat.com (subscribers-only) S: Maintained AX.25 NETWORK LAYER diff --git a/trunk/Makefile b/trunk/Makefile index 4e0d7c68d223..45e5a38fbc7a 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 -SUBLEVEL = 14 -EXTRAVERSION =-rc1 +SUBLEVEL = 13 +EXTRAVERSION = NAME=Affluent Albatross # *DOCUMENTATION* diff --git a/trunk/arch/arm/mach-pxa/Kconfig b/trunk/arch/arm/mach-pxa/Kconfig index 3e5f69bb5ac4..405a55f2287c 100644 --- a/trunk/arch/arm/mach-pxa/Kconfig +++ b/trunk/arch/arm/mach-pxa/Kconfig @@ -20,66 +20,40 @@ config ARCH_PXA_IDP select PXA25x config PXA_SHARPSL - bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models" + bool "SHARP SL-5600 and SL-C7xx Models" + select PXA25x select SHARP_SCOOP select SHARP_PARAM help Say Y here if you intend to run this kernel on a - Sharp Zaurus SL-5600 (Poodle), SL-C700 (Corgi), - SL-C750 (Shepherd), SL-C760 (Husky), SL-C1000 (Akita), - SL-C3000 (Spitz) or SL-C3100 (Borzoi) handheld computer. + Sharp SL-5600 (Poodle), Sharp SL-C700 (Corgi), + SL-C750 (Shepherd) or a Sharp SL-C760 (Husky) + handheld computer. endchoice -if PXA_SHARPSL - -choice - prompt "Select target Sharp Zaurus device range" - -config PXA_SHARPSL_25x - bool "Sharp PXA25x models (SL-5600 and SL-C7xx)" - select PXA25x - -config PXA_SHARPSL_27x - bool "Sharp PXA270 models (SL-Cxx00)" - select PXA27x - -endchoice - -endif - endmenu config MACH_POODLE bool "Enable Sharp SL-5600 (Poodle) Support" - depends PXA_SHARPSL_25x + depends PXA_SHARPSL select SHARP_LOCOMO config MACH_CORGI bool "Enable Sharp SL-C700 (Corgi) Support" - depends PXA_SHARPSL_25x + depends PXA_SHARPSL select PXA_SHARP_C7xx config MACH_SHEPHERD bool "Enable Sharp SL-C750 (Shepherd) Support" - depends PXA_SHARPSL_25x + depends PXA_SHARPSL select PXA_SHARP_C7xx config MACH_HUSKY bool "Enable Sharp SL-C760 (Husky) Support" - depends PXA_SHARPSL_25x + depends PXA_SHARPSL select PXA_SHARP_C7xx -config MACH_SPITZ - bool "Enable Sharp Zaurus SL-3000 (Spitz) Support" - depends PXA_SHARPSL_27x - select PXA_SHARP_Cxx00 - -config MACH_BORZOI - bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support" - depends PXA_SHARPSL_27x - select PXA_SHARP_Cxx00 - config PXA25x bool help @@ -100,9 +74,4 @@ config PXA_SHARP_C7xx help Enable support for all Sharp C7xx models -config PXA_SHARP_Cxx00 - bool - help - Enable common support for Sharp Cxx00 models - endif diff --git a/trunk/arch/arm/mach-pxa/Makefile b/trunk/arch/arm/mach-pxa/Makefile index f609a0f232cb..33dae99ec2d8 100644 --- a/trunk/arch/arm/mach-pxa/Makefile +++ b/trunk/arch/arm/mach-pxa/Makefile @@ -12,7 +12,6 @@ obj-$(CONFIG_ARCH_LUBBOCK) += lubbock.o obj-$(CONFIG_MACH_MAINSTONE) += mainstone.o obj-$(CONFIG_ARCH_PXA_IDP) += idp.o obj-$(CONFIG_PXA_SHARP_C7xx) += corgi.o corgi_ssp.o corgi_lcd.o ssp.o -obj-$(CONFIG_PXA_SHARP_Cxx00) += spitz.o corgi_ssp.o corgi_lcd.o ssp.o obj-$(CONFIG_MACH_POODLE) += poodle.o # Support for blinky lights diff --git a/trunk/arch/arm/mach-pxa/corgi.c b/trunk/arch/arm/mach-pxa/corgi.c index 426c2bc517eb..07b5dd453565 100644 --- a/trunk/arch/arm/mach-pxa/corgi.c +++ b/trunk/arch/arm/mach-pxa/corgi.c @@ -41,7 +41,6 @@ #include #include "generic.h" -#include "sharpsl.h" /* @@ -95,30 +94,14 @@ struct platform_device corgissp_device = { .id = -1, }; -struct corgissp_machinfo corgi_ssp_machinfo = { - .port = 1, - .cs_lcdcon = CORGI_GPIO_LCDCON_CS, - .cs_ads7846 = CORGI_GPIO_ADS7846_CS, - .cs_max1111 = CORGI_GPIO_MAX1111_CS, - .clk_lcdcon = 76, - .clk_ads7846 = 2, - .clk_max1111 = 8, -}; - /* * Corgi Backlight Device */ -static struct corgibl_machinfo corgi_bl_machinfo = { - .max_intensity = 0x2f, - .set_bl_intensity = corgi_bl_set_intensity, -}; - static struct platform_device corgibl_device = { .name = "corgi-bl", .dev = { .parent = &corgifb_device.dev, - .platform_data = &corgi_bl_machinfo, }, .id = -1, }; @@ -136,29 +119,12 @@ static struct platform_device corgikbd_device = { /* * Corgi Touch Screen Device */ -static struct resource corgits_resources[] = { - [0] = { - .start = CORGI_IRQ_GPIO_TP_INT, - .end = CORGI_IRQ_GPIO_TP_INT, - .flags = IORESOURCE_IRQ, - }, -}; - -static struct corgits_machinfo corgi_ts_machinfo = { - .get_hsync_len = corgi_get_hsync_len, - .put_hsync = corgi_put_hsync, - .wait_hsync = corgi_wait_hsync, -}; - static struct platform_device corgits_device = { .name = "corgi-ts", .dev = { .parent = &corgissp_device.dev, - .platform_data = &corgi_ts_machinfo, }, .id = -1, - .num_resources = ARRAY_SIZE(corgits_resources), - .resource = corgits_resources, }; @@ -259,10 +225,7 @@ static struct platform_device *devices[] __initdata = { static void __init corgi_init(void) { - corgi_ssp_set_machinfo(&corgi_ssp_machinfo); - pxa_gpio_mode(CORGI_GPIO_USB_PULLUP | GPIO_OUT); - pxa_gpio_mode(CORGI_GPIO_HSYNC | GPIO_IN); pxa_set_udc_info(&udc_info); pxa_set_mci_info(&corgi_mci_platform_data); diff --git a/trunk/arch/arm/mach-pxa/corgi_lcd.c b/trunk/arch/arm/mach-pxa/corgi_lcd.c index c5efcd04fcbc..deac29c00290 100644 --- a/trunk/arch/arm/mach-pxa/corgi_lcd.c +++ b/trunk/arch/arm/mach-pxa/corgi_lcd.c @@ -1,14 +1,10 @@ /* * linux/drivers/video/w100fb.c * - * Corgi/Spitz LCD Specific Code + * Corgi LCD Specific Code for ATI Imageon w100 (Wallaby) * * Copyright (C) 2005 Richard Purdie * - * Connectivity: - * Corgi - LCD to ATI Imageon w100 (Wallaby) - * Spitz - LCD to PXA Framebuffer - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. @@ -18,17 +14,9 @@ #include #include #include -#include -#include -#include #include -#include -#include -#include -#include -#include #include -#include "generic.h" +#include