Auto-update from upstream

d3e4cefc · Len Brown <[email protected]> · 2005-12-14 02:59:50 -05:00

Commit: d3e4cefc86ce1aefc0e9aebdc56308cb4bd51997
Parents: 927fe183 · acd9b7b4

Merge commit. Changes below are compared with the first parent: 927fe183.

Changes

247 files changed · +4582 −3840

File	Status	Add	Del	Content
Documentation/arm/00-INDEX	modified	+2	−0	View file
Documentation/dvb/README.dvb-usb	modified	+25	−25	View file
Documentation/dvb/README.flexcop	modified	+1	−1	View file
Documentation/dvb/avermedia.txt	modified	+1	−1	View file
Documentation/dvb/cards.txt	modified	+4	−4	View file
Documentation/dvb/contributors.txt	modified	+2	−2	View file
Documentation/dvb/readme.txt	modified	+2	−2	View file
Documentation/filesystems/ext3.txt	modified	+13	−13	View file
MAINTAINERS	modified	+2	−2	View file
Makefile	modified	+1	−1	View file
arch/arm/kernel/ptrace.c	modified	+9	−0	View file
arch/i386/kernel/kprobes.c	modified	+1	−1	View file
arch/i386/kernel/smpboot.c	modified	+1	−2	View file
arch/i386/kernel/traps.c	modified	+0	−7	View file
arch/i386/mm/ioremap.c	modified	+29	−8	View file
arch/i386/pci/direct.c	modified	+2	−2	View file
arch/i386/pci/mmconfig.c	modified	+56	−9	View file
arch/i386/pci/pci.h	modified	+7	−0	View file
arch/ia64/Kconfig	modified	+1	−1	View file
arch/ia64/configs/sn2_defconfig	modified	+109	−43	View file
arch/ia64/configs/tiger_defconfig	modified	+50	−24	View file
arch/ia64/ia32/binfmt_elf32.c	modified	+0	−2	View file
arch/ia64/ia32/ia32priv.h	modified	+0	−1	View file
arch/ia64/kernel/kprobes.c	modified	+1	−1	View file
arch/ia64/kernel/process.c	modified	+4	−1	View file
arch/ia64/kernel/salinfo.c	modified	+1	−1	View file
arch/ia64/mm/discontig.c	modified	+3	−1	View file
arch/ia64/sn/kernel/io_init.c	modified	+131	−22	View file
arch/ia64/sn/kernel/sn2/ptc_deadlock.S	modified	+6	−2	View file
arch/mips/mm/init.c	modified	+2	−2	View file
arch/powerpc/Kconfig	modified	+1	−1	View file
arch/powerpc/kernel/kprobes.c	modified	+1	−1	View file
arch/powerpc/kernel/setup_64.c	modified	+9	−1	View file
arch/powerpc/mm/hash_utils_64.c	modified	+1	−1	View file
arch/powerpc/mm/hugetlbpage.c	modified	+77	−18	View file
arch/powerpc/mm/numa.c	modified	+1	−1	View file
arch/powerpc/mm/stab.c	modified	+1	−6	View file
arch/powerpc/platforms/powermac/feature.c	modified	+16	−5	View file
arch/powerpc/platforms/pseries/iommu.c	modified	+7	−4	View file
arch/powerpc/platforms/pseries/lpar.c	modified	+0	−12	View file
arch/ppc/Kconfig	modified	+3	−3	View file
arch/ppc/kernel/smp.c	modified	+4	−0	View file
arch/ppc/platforms/pmac_feature.c	modified	+15	−5	View file
arch/sparc/Makefile	modified	+1	−1	View file
arch/sparc/lib/atomic32.c	modified	+0	−1	View file
arch/sparc64/kernel/kprobes.c	modified	+1	−1	View file
arch/um/include/um_uaccess.h	modified	+2	−0	View file
arch/um/kernel/skas/include/uaccess-skas.h	modified	+0	−1	View file
arch/x86_64/ia32/ia32_binfmt.c	modified	+1	−2	View file
arch/x86_64/kernel/kprobes.c	modified	+1	−1	View file
arch/x86_64/kernel/smpboot.c	modified	+1	−1	View file
arch/x86_64/kernel/time.c	modified	+4	−2	View file
arch/x86_64/mm/ioremap.c	modified	+31	−6	View file
arch/x86_64/mm/numa.c	modified	+3	−1	View file
arch/x86_64/pci/mmconfig.c	modified	+53	−10	View file
drivers/acpi/pci_link.c	modified	+1	−1	View file
drivers/block/cciss.c	modified	+3	−4	View file
drivers/char/Kconfig	modified	+9	−9	View file
drivers/char/drm/radeon_cp.c	modified	+1	−1	View file
drivers/char/ipmi/ipmi_msghandler.c	modified	+1	−1	View file
drivers/char/watchdog/mpcore_wdt.c	modified	+0	−4	View file
drivers/connector/cn_proc.c	modified	+5	−0	View file
drivers/macintosh/windfarm_pm81.c	modified	+2	−2	View file
drivers/md/raid1.c	modified	+3	−2	View file
drivers/md/raid5.c	modified	+4	−3	View file
drivers/media/common/Kconfig	modified	+3	−3	View file
drivers/media/common/Makefile	modified	+2	−2	View file
drivers/media/common/ir-common.c	modified	+1	−0	View file
drivers/media/common/saa7146_core.c	modified	+3	−3	View file
drivers/media/common/saa7146_fops.c	modified	+16	−16	View file
drivers/media/common/saa7146_i2c.c	modified	+8	−8	View file
drivers/media/common/saa7146_vbi.c	modified	+2	−2	View file
drivers/media/common/saa7146_video.c	modified	+23	−23	View file
drivers/media/dvb/b2c2/flexcop-common.h	modified	+1	−1	View file
drivers/media/dvb/b2c2/flexcop-fe-tuner.c	modified	+2	−2	View file
drivers/media/dvb/bt8xx/dvb-bt8xx.c	modified	+3	−3	View file
drivers/media/dvb/dvb-core/demux.h	modified	+46	−46	View file
drivers/media/dvb/dvb-core/dmxdev.c	modified	+1	−1	View file
drivers/media/dvb/dvb-core/dmxdev.h	modified	+32	−32	View file
drivers/media/dvb/dvb-core/dvb_ca_en50221.c	modified	+1	−1	View file
drivers/media/dvb/dvb-core/dvb_filter.c	modified	+166	−166	View file
drivers/media/dvb/dvb-core/dvb_filter.h	modified	+51	−51	View file
drivers/media/dvb/dvb-core/dvb_frontend.c	modified	+4	−4	View file
drivers/media/dvb/dvb-core/dvb_frontend.h	modified	+4	−4	View file
drivers/media/dvb/dvb-core/dvb_net.c	modified	+21	−21	View file
drivers/media/dvb/dvb-core/dvb_ringbuffer.c	modified	+131	−131	View file
drivers/media/dvb/dvb-core/dvb_ringbuffer.h	modified	+10	−10	View file
drivers/media/dvb/dvb-core/dvbdev.c	modified	+71	−71	View file
drivers/media/dvb/dvb-core/dvbdev.h	modified	+3	−3	View file
drivers/media/dvb/dvb-usb/vp702x-fe.c	modified	+1	−1	View file
drivers/media/dvb/dvb-usb/vp7045-fe.c	modified	+1	−1	View file
drivers/media/dvb/frontends/at76c651.c	modified	+3	−3	View file
drivers/media/dvb/frontends/bcm3510.c	modified	+2	−2	View file
drivers/media/dvb/frontends/cx22700.c	modified	+5	−5	View file
drivers/media/dvb/frontends/cx22702.c	modified	+1	−1	View file
drivers/media/dvb/frontends/cx22702.h	modified	+1	−1	View file
drivers/media/dvb/frontends/cx24110.c	modified	+156	−156	View file
drivers/media/dvb/frontends/l64781.c	modified	+13	−13	View file
drivers/media/dvb/frontends/l64781.h	modified	+1	−1	View file
drivers/media/dvb/frontends/lgdt330x.c	modified	+4	−4	View file
drivers/media/dvb/frontends/mt312.c	modified	+2	−2	View file
drivers/media/dvb/frontends/nxt2002.c	modified	+3	−3	View file
drivers/media/dvb/frontends/nxt200x.c	modified	+2	−2	View file
drivers/media/dvb/frontends/nxt6000.c	modified	+5	−5	View file
drivers/media/dvb/frontends/or51132.c	modified	+1	−1	View file
drivers/media/dvb/frontends/s5h1420.c	modified	+3	−3	View file
drivers/media/dvb/frontends/s5h1420.h	modified	+1	−1	View file
drivers/media/dvb/frontends/sp8870.c	modified	+8	−8	View file
drivers/media/dvb/frontends/sp887x.c	modified	+7	−7	View file
drivers/media/dvb/frontends/stv0299.c	modified	+18	−18	View file
drivers/media/dvb/frontends/tda10021.c	modified	+5	−5	View file
drivers/media/dvb/frontends/tda10021.h	modified	+2	−2	View file
drivers/media/dvb/frontends/tda1004x.c	modified	+1	−1	View file
drivers/media/dvb/frontends/tda8083.c	modified	+10	−10	View file
drivers/media/dvb/ttpci/av7110.c	modified	+13	−13	View file
drivers/media/dvb/ttpci/av7110_hw.c	modified	+10	−10	View file
drivers/media/dvb/ttpci/av7110_v4l.c	modified	+2	−2	View file
drivers/media/dvb/ttpci/budget-core.c	modified	+1	−1	View file
drivers/media/dvb/ttpci/budget-patch.c	modified	+163	−163	View file
drivers/media/dvb/ttpci/budget.c	modified	+3	−3	View file
drivers/media/dvb/ttpci/budget.h	modified	+1	−1	View file
drivers/media/dvb/ttpci/fdump.c	modified	+1	−1	View file
drivers/media/dvb/ttpci/ttpci-eeprom.c	modified	+20	−20	View file
drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c	modified	+64	−64	View file
drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h	modified	+1638	−1638	View file
drivers/media/dvb/ttusb-dec/ttusb_dec.c	modified	+2	−2	View file
drivers/media/video/Kconfig	modified	+7	−7	View file
drivers/media/video/bt832.c	modified	+7	−7	View file
drivers/media/video/bttv-driver.c	modified	+41	−41	View file
drivers/media/video/bttvp.h	modified	+1	−0	View file
drivers/media/video/cx88/cx88-blackbird.c	modified	+2	−0	View file
drivers/media/video/cx88/cx88-input.c	modified	+0	−2	View file
drivers/media/video/cx88/cx88.h	modified	+0	−1	View file
drivers/media/video/em28xx/em28xx-core.c	modified	+7	−47	View file
drivers/media/video/em28xx/em28xx-i2c.c	modified	+2	−2	View file
drivers/media/video/em28xx/em28xx-video.c	modified	+6	−17	View file
drivers/media/video/em28xx/em28xx.h	modified	+4	−4	View file
drivers/media/video/ir-kbd-gpio.c	modified	+4	−4	View file
drivers/media/video/ir-kbd-i2c.c	modified	+6	−5	View file
drivers/media/video/msp3400.c	modified	+11	−7	View file
drivers/media/video/saa6588.c	modified	+0	−1	View file
drivers/media/video/saa711x.c	modified	+1	−1	View file
drivers/media/video/saa7134/saa6752hs.c	modified	+9	−8	View file
drivers/media/video/saa7134/saa7134-alsa.c	modified	+12	−4	View file
drivers/media/video/saa7134/saa7134-cards.c	modified	+1	−1	View file
drivers/media/video/saa7134/saa7134-core.c	modified	+1	−0	View file
drivers/media/video/saa7134/saa7134-empress.c	modified	+1	−0	View file
drivers/media/video/saa7134/saa7134-i2c.c	modified	+1	−1	View file
drivers/media/video/saa7134/saa7134-oss.c	modified	+47	−46	View file
drivers/media/video/tda9887.c	modified	+8	−7	View file
drivers/media/video/tvaudio.c	modified	+15	−15	View file
drivers/media/video/tveeprom.c	modified	+2	−1	View file
drivers/media/video/tvp5150.c	modified	+1	−2	View file
drivers/media/video/video-buf-dvb.c	modified	+2	−0	View file
drivers/mfd/ucb1x00-ts.c	modified	+11	−8	View file
drivers/mmc/mmc.c	modified	+3	−2	View file
drivers/mtd/devices/blkmtd.c	modified	+4	−4	View file
drivers/net/pcnet32.c	modified	+0	−5	View file
drivers/net/sk98lin/skge.c	modified	+2	−2	View file
drivers/net/skge.c	modified	+6	−4	View file
drivers/net/tg3.c	modified	+64	−13	View file
drivers/net/tg3.h	modified	+7	−0	View file
drivers/scsi/libata-core.c	modified	+2	−2	View file
drivers/scsi/libata-scsi.c	modified	+5	−2	View file
drivers/scsi/sata_mv.c	modified	+2	−1	View file
drivers/scsi/sata_promise.c	modified	+6	−6	View file
drivers/scsi/sata_sx4.c	modified	+2	−1	View file
drivers/scsi/scsi_lib.c	modified	+8	−1	View file
drivers/scsi/scsi_scan.c	modified	+0	−3	View file
drivers/serial/8250_pci.c	modified	+1	−1	View file
drivers/usb/input/hid-core.c	modified	+3	−1	View file
drivers/video/bw2.c	modified	+0	−1	View file
drivers/video/cfbcopyarea.c	modified	+4	−4	View file
drivers/video/cfbfillrect.c	modified	+8	−8	View file
drivers/video/cfbimgblt.c	modified	+12	−23	View file
drivers/video/cg14.c	modified	+0	−1	View file
drivers/video/cg3.c	modified	+0	−1	View file
drivers/video/cg6.c	modified	+1	−2	View file
drivers/video/console/fbcon.c	modified	+33	−9	View file
drivers/video/fbmem.c	modified	+21	−5	View file
drivers/video/ffb.c	modified	+0	−1	View file
drivers/video/leo.c	modified	+0	−1	View file
drivers/video/p9100.c	modified	+0	−1	View file
drivers/video/pxafb.c	modified	+2	−1	View file
drivers/video/tcx.c	modified	+1	−2	View file
fs/inotify.c	modified	+10	−3	View file
fs/xattr.c	modified	+1	−1	View file
include/asm-arm/arch-pxa/irq.h	modified	+0	−5	View file
include/asm-arm/io.h	modified	+3	−3	View file
include/asm-arm/memory.h	modified	+1	−0	View file
include/asm-ia64/ia32.h	modified	+2	−0	View file
include/asm-ia64/local.h	modified	+2	−2	View file
include/asm-ia64/sal.h	modified	+2	−1	View file
include/asm-ia64/sn/pcidev.h	modified	+17	−3	View file
include/asm-ia64/spinlock.h	modified	+11	−1	View file
include/asm-powerpc/mmu.h	modified	+2	−1	View file
include/linux/cn_proc.h	modified	+2	−0	View file
include/linux/dvb/audio.h	modified	+14	−14	View file
include/linux/dvb/ca.h	modified	+18	−18	View file
include/linux/dvb/dmx.h	modified	+10	−10	View file
include/linux/dvb/osd.h	modified	+29	−29	View file
include/linux/dvb/video.h	modified	+22	−22	View file
include/linux/fb.h	modified	+30	−0	View file
include/linux/i2c-id.h	modified	+1	−1	View file
include/linux/inotify.h	modified	+2	−0	View file
include/linux/kprobes.h	modified	+7	−1	View file
include/linux/libata.h	modified	+1	−0	View file
include/linux/list.h	modified	+25	−1	View file
include/linux/mm.h	modified	+0	−1	View file
include/linux/parport_pc.h	modified	+1	−1	View file
include/linux/rcupdate.h	modified	+2	−0	View file
include/linux/sysctl.h	modified	+3	−0	View file
include/linux/time.h	modified	+1	−0	View file
include/media/saa7146.h	modified	+3	−3	View file
include/media/saa7146_vv.h	modified	+5	−5	View file
include/net/dn.h	modified	+4	−0	View file
init/Kconfig	modified	+2	−2	View file
kernel/audit.c	modified	+3	−1	View file
kernel/kprobes.c	modified	+30	−6	View file
kernel/rcupdate.c	modified	+54	−5	View file
kernel/rcutorture.c	modified	+1	−2	View file
kernel/sys.c	modified	+2	−1	View file
kernel/time.c	modified	+22	−0	View file
mm/bootmem.c	modified	+2	−0	View file
mm/memory.c	modified	+19	−50	View file
mm/memory_hotplug.c	modified	+1	−1	View file
net/core/dev.c	modified	+2	−1	View file
net/core/skbuff.c	modified	+1	−1	View file
net/decnet/af_decnet.c	modified	+22	−3	View file
net/decnet/sysctl_net_decnet.c	modified	+33	−0	View file
net/ieee80211/Kconfig	modified	+1	−1	View file
net/ipv4/netfilter/Kconfig	modified	+4	−4	View file
net/ipv4/netfilter/ip_conntrack_core.c	modified	+11	−9	View file
net/ipv4/netfilter/ip_conntrack_netlink.c	modified	+5	−7	View file
net/ipv4/netfilter/ip_conntrack_proto_tcp.c	modified	+2	−1	View file
net/ipv4/netfilter/ip_nat_tftp.c	modified	+4	−1	View file
net/ipv4/tcp_output.c	modified	+124	−109	View file
net/ipv4/tcp_vegas.c	modified	+4	−12	View file
net/ipv6/addrconf.c	modified	+2	−2	View file
net/ipv6/esp6.c	modified	+1	−1	View file
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c	modified	+6	−6	View file
net/ipv6/tcp_ipv6.c	modified	+9	−10	View file
net/netfilter/Kconfig	modified	+2	−2	View file
net/netfilter/nf_conntrack_core.c	modified	+3	−0	View file
net/netfilter/nfnetlink.c	modified	+2	−3	View file
net/packet/af_packet.c	modified	+61	−54	View file
net/sched/act_api.c	modified	+1	−1	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/arm/00-INDEX

View file

diff --git a/Documentation/arm/00-INDEX b/Documentation/arm/00-INDEX
index d753fe5..2c6a3b3 100644
--- a/Documentation/arm/00-INDEX
+++ b/Documentation/arm/00-INDEX
@@ -16,5 +16,7 @@ empeg
 	- Empeg documentation
 mem_alignment
 	- alignment abort handler documentation
+memory.txt
+	- description of the virtual memory layout
 nwfpe
 	- NWFPE floating point emulator documentation

Documentation/dvb/README.dvb-usb

View file

diff --git a/Documentation/dvb/README.dvb-usb b/Documentation/dvb/README.dvb-usb
index ac0797e..46b78b7 100644
--- a/Documentation/dvb/README.dvb-usb
+++ b/Documentation/dvb/README.dvb-usb
@@ -50,12 +50,12 @@ http://www.linuxtv.org/wiki/index.php/DVB_USB
 0. History & News:
   2005-06-30 - added support for WideView WT-220U (Thanks to Steve Chang)
   2005-05-30 - added basic isochronous support to the dvb-usb-framework
-               added support for Conexant Hybrid reference design and Nebula DigiTV USB
+	       added support for Conexant Hybrid reference design and Nebula DigiTV USB
   2005-04-17 - all dibusb devices ported to make use of the dvb-usb-framework
   2005-04-02 - re-enabled and improved remote control code.
   2005-03-31 - ported the Yakumo/Hama/Typhoon DVB-T USB2.0 device to dvb-usb.
   2005-03-30 - first commit of the dvb-usb-module based on the dibusb-source. First device is a new driver for the
-               TwinhanDTV Alpha / MagicBox II USB2.0-only DVB-T device.
+	       TwinhanDTV Alpha / MagicBox II USB2.0-only DVB-T device.
 
   (change from dvb-dibusb to dvb-usb)
   2005-03-28 - added support for the AVerMedia AverTV DVB-T USB2.0 device (Thanks to Glen Harris and Jiun-Kuei Jung, AVerMedia)
@@ -64,50 +64,50 @@ http://www.linuxtv.org/wiki/index.php/DVB_USB
   2005-02-02 - added support for the Hauppauge Win-TV Nova-T USB2
   2005-01-31 - distorted streaming is gone for USB1.1 devices
   2005-01-13 - moved the mirrored pid_filter_table back to dvb-dibusb
-             - first almost working version for HanfTek UMT-010
-             - found out, that Yakumo/HAMA/Typhoon are predecessors of the HanfTek UMT-010
+	     - first almost working version for HanfTek UMT-010
+	     - found out, that Yakumo/HAMA/Typhoon are predecessors of the HanfTek UMT-010
   2005-01-10 - refactoring completed, now everything is very delightful
-             - tuner quirks for some weird devices (Artec T1 AN2235 device has sometimes a
-               Panasonic Tuner assembled). Tunerprobing implemented. Thanks a lot to Gunnar Wittich.
+	     - tuner quirks for some weird devices (Artec T1 AN2235 device has sometimes a
+	       Panasonic Tuner assembled). Tunerprobing implemented. Thanks a lot to Gunnar Wittich.
   2004-12-29 - after several days of struggling around bug of no returning URBs fixed.
   2004-12-26 - refactored the dibusb-driver, splitted into separate files
-             - i2c-probing enabled
+	     - i2c-probing enabled
   2004-12-06 - possibility for demod i2c-address probing
-             - new usb IDs (Compro, Artec)
+	     - new usb IDs (Compro, Artec)
   2004-11-23 - merged changes from DiB3000MC_ver2.1
-             - revised the debugging
-             - possibility to deliver the complete TS for USB2.0
+	     - revised the debugging
+	     - possibility to deliver the complete TS for USB2.0
   2004-11-21 - first working version of the dib3000mc/p frontend driver.
   2004-11-12 - added additional remote control keys. Thanks to Uwe Hanke.
   2004-11-07 - added remote control support. Thanks to David Matthews.
   2004-11-05 - added support for a new devices (Grandtec/Avermedia/Artec)
-             - merged my changes (for dib3000mb/dibusb) to the FE_REFACTORING, because it became HEAD
-             - moved transfer control (pid filter, fifo control) from usb driver to frontend, it seems
-               better settled there (added xfer_ops-struct)
-             - created a common files for frontends (mc/p/mb)
+	     - merged my changes (for dib3000mb/dibusb) to the FE_REFACTORING, because it became HEAD
+	     - moved transfer control (pid filter, fifo control) from usb driver to frontend, it seems
+	       better settled there (added xfer_ops-struct)
+	     - created a common files for frontends (mc/p/mb)
   2004-09-28 - added support for a new device (Unkown, vendor ID is Hyper-Paltek)
   2004-09-20 - added support for a new device (Compro DVB-U2000), thanks
-               to Amaury Demol for reporting
-             - changed usb TS transfer method (several urbs, stopping transfer
-               before setting a new pid)
+	       to Amaury Demol for reporting
+	     - changed usb TS transfer method (several urbs, stopping transfer
+	       before setting a new pid)
   2004-09-13 - added support for a new device (Artec T1 USB TVBOX), thanks
-               to Christian Motschke for reporting
+	       to Christian Motschke for reporting
   2004-09-05 - released the dibusb device and dib3000mb-frontend driver
 
   (old news for vp7041.c)
   2004-07-15 - found out, by accident, that the device has a TUA6010XS for
-               PLL
+	       PLL
   2004-07-12 - figured out, that the driver should also work with the
-               CTS Portable (Chinese Television System)
+	       CTS Portable (Chinese Television System)
   2004-07-08 - firmware-extraction-2.422-problem solved, driver is now working
-               properly with firmware extracted from 2.422
-             - #if for 2.6.4 (dvb), compile issue
-             - changed firmware handling, see vp7041.txt sec 1.1
+	       properly with firmware extracted from 2.422
+	     - #if for 2.6.4 (dvb), compile issue
+	     - changed firmware handling, see vp7041.txt sec 1.1
   2004-07-02 - some tuner modifications, v0.1, cleanups, first public
   2004-06-28 - now using the dvb_dmx_swfilter_packets, everything
-               runs fine now
+	       runs fine now
   2004-06-27 - able to watch and switching channels (pre-alpha)
-             - no section filtering yet
+	     - no section filtering yet
   2004-06-06 - first TS received, but kernel oops :/
   2004-05-14 - firmware loader is working
   2004-05-11 - start writing the driver

Documentation/dvb/README.flexcop

View file

diff --git a/Documentation/dvb/README.flexcop b/Documentation/dvb/README.flexcop
index a50c70f..5515469 100644
--- a/Documentation/dvb/README.flexcop
+++ b/Documentation/dvb/README.flexcop
@@ -174,7 +174,7 @@ Debugging
 Everything which is identical in the following table, can be put into a common
 flexcop-module.
 
-                  PCI                  USB
+		  PCI                  USB
 -------------------------------------------------------------------------------
 Different:
 Register access:  accessing IO memory  USB control message

Documentation/dvb/avermedia.txt

View file

diff --git a/Documentation/dvb/avermedia.txt b/Documentation/dvb/avermedia.txt
index 09020eb..2dc260b 100644
--- a/Documentation/dvb/avermedia.txt
+++ b/Documentation/dvb/avermedia.txt
@@ -1,6 +1,6 @@
 
 HOWTO: Get An Avermedia DVB-T working under Linux
-           ______________________________________________
+	   ______________________________________________
 
    Table of Contents
    Assumptions and Introduction

Documentation/dvb/cards.txt

View file

diff --git a/Documentation/dvb/cards.txt b/Documentation/dvb/cards.txt
index 19329cf..9e10092 100644
--- a/Documentation/dvb/cards.txt
+++ b/Documentation/dvb/cards.txt
@@ -16,7 +16,7 @@ Hardware supported by the linuxtv.org DVB drivers
   shielding, and the whole metal box has its own part number.
 
 
-o Frontends drivers: 
+o Frontends drivers:
   - dvb_dummy_fe: for testing...
   DVB-S:
    - ves1x93		: Alps BSRV2 (ves1893 demodulator) and dbox2 (ves1993)
@@ -24,7 +24,7 @@ o Frontends drivers:
    - grundig_29504-491	: Grundig 29504-491 (Philips TDA8083 demodulator), tsa5522 PLL
    - mt312		: Zarlink mt312 or Mitel vp310 demodulator, sl1935 or tsa5059 PLL
    - stv0299		: Alps BSRU6 (tsa5059 PLL), LG TDQB-S00x (tsa5059 PLL),
-   			  LG TDQF-S001F (sl1935 PLL), Philips SU1278 (tua6100 PLL), 
+			  LG TDQF-S001F (sl1935 PLL), Philips SU1278 (tua6100 PLL),
 			  Philips SU1278SH (tsa5059 PLL), Samsung TBMU24112IMB
   DVB-C:
    - ves1820		: various (ves1820 demodulator, sp5659c or spXXXX PLL)
@@ -35,8 +35,8 @@ o Frontends drivers:
    - grundig_29504-401	: Grundig 29504-401 (LSI L64781 demodulator), tsa5060 PLL
    - tda1004x		: Philips tda10045h (td1344 or tdm1316l PLL)
    - nxt6000 		: Alps TDME7 (MITEL SP5659 PLL), Alps TDED4 (TI ALP510 PLL),
-               		  Comtech DVBT-6k07 (SP5730 PLL)
-               		  (NxtWave Communications NXT6000 demodulator)
+			  Comtech DVBT-6k07 (SP5730 PLL)
+			  (NxtWave Communications NXT6000 demodulator)
    - sp887x		: Microtune 7202D
    - dib3000mb	: DiBcom 3000-MB demodulator
   DVB-S/C/T:

Documentation/dvb/contributors.txt

View file

diff --git a/Documentation/dvb/contributors.txt b/Documentation/dvb/contributors.txt
index 2cbd2d0..4c33cce 100644
--- a/Documentation/dvb/contributors.txt
+++ b/Documentation/dvb/contributors.txt
@@ -15,7 +15,7 @@ Michael Holzt <[email protected]>
 
 Diego Picciani <[email protected]>
   for CyberLogin for Linux which allows logging onto EON
-  (in case you are wondering where CyberLogin is, EON changed its login 
+  (in case you are wondering where CyberLogin is, EON changed its login
   procedure and CyberLogin is no longer used.)
 
 Martin Schaller <[email protected]>
@@ -57,7 +57,7 @@ Augusto Cardoso <[email protected]>
 Davor Emard <[email protected]>
   for his work on the budget drivers, the demux code,
   the module unloading problems, ...
-  
+
 Hans-Frieder Vogt <[email protected]>
   for his work on calculating and checking the crc's for the
   TechnoTrend/Hauppauge DEC driver firmware

Documentation/dvb/readme.txt

View file

diff --git a/Documentation/dvb/readme.txt b/Documentation/dvb/readme.txt
index 754c98c..f5c50b2 100644
--- a/Documentation/dvb/readme.txt
+++ b/Documentation/dvb/readme.txt
@@ -20,7 +20,7 @@ http://linuxtv.org/downloads/
 
 What's inside this directory:
 
-"cards.txt" 
+"cards.txt"
 contains a list of supported hardware.
 
 "contributors.txt"
@@ -37,7 +37,7 @@ that require it.
 contains detailed informations about the
 TT DEC2000/DEC3000 USB DVB hardware.
 
-"bt8xx.txt" 
+"bt8xx.txt"
 contains detailed installation instructions for the
 various bt8xx based "budget" DVB cards
 (Nebula, Pinnacle PCTV, Twinhan DST)

Documentation/filesystems/ext3.txt

View file

diff --git a/Documentation/filesystems/ext3.txt b/Documentation/filesystems/ext3.txt
index 9ab7f44..9840d5b 100644
--- a/Documentation/filesystems/ext3.txt
+++ b/Documentation/filesystems/ext3.txt
@@ -57,19 +57,19 @@ oldalloc		This disables the Orlov block allocator and enables the
 			we'd like to get some feedback if it's the contrary for
 			you.
 
-user_xattr	(*)	Enables POSIX Extended Attributes. It's enabled by
-			default, however you need to confifure its support
-			(CONFIG_EXT3_FS_XATTR). This is neccesary if you want
-			to use POSIX Acces Control Lists support. You can visit
-			http://acl.bestbits.at to know more about POSIX Extended
-			attributes.
-
-nouser_xattr		Disables POSIX Extended Attributes.
-
-acl		(*)	Enables POSIX Access Control Lists support. This is
-			enabled by default, however you need to configure
-			its support (CONFIG_EXT3_FS_POSIX_ACL). If you want
-			to know more about ACLs visit http://acl.bestbits.at
+user_xattr		Enables Extended User Attributes. Additionally, you need
+			to have extended attribute support enabled in the kernel
+			configuration (CONFIG_EXT3_FS_XATTR). See the attr(5)
+			manual page and http://acl.bestbits.at to learn more
+			about extended attributes.
+
+nouser_xattr		Disables Extended User Attributes.
+
+acl			Enables POSIX Access Control Lists support.  Additionally,
+			you need to have ACL support enabled in the kernel
+			configuration (CONFIG_EXT3_FS_POSIX_ACL). See the acl(5)
+			manual page and http://acl.bestbits.at for more
+			information.
 
 noacl			This option disables POSIX Access Control List support.
 

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 77bb086..da6973a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1284,8 +1284,8 @@ T:	git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
 S:	Supported
 
 INPUT (KEYBOARD, MOUSE, JOYSTICK) DRIVERS
-P:	Vojtech Pavlik
-M:	[email protected]
+P:	Dmitry Torokhov
+M:	[email protected]
 L:	[email protected]
 L:	[email protected]
 T:	git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git

Makefile

View file

diff --git a/Makefile b/Makefile
index b1c458c..ad457e1 100644
--- a/Makefile
+++ b/Makefile
@@ -408,7 +408,7 @@ outputmakefile:
 # of make so .config is not included in this case either (for *config).
 
 no-dot-config-targets := clean mrproper distclean \
-			 cscope TAGS tags help %docs check% kernelrelease
+			 cscope TAGS tags help %docs check%
 
 config-targets := 0
 mixed-targets  := 0

arch/arm/kernel/ptrace.c

View file

diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index 9a340e7..2b84f78 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -242,6 +242,15 @@ get_branch_address(struct task_struct *child, unsigned long pc, unsigned long in
 		 */
 		long aluop1, aluop2, ccbit;
 
+	        if ((insn & 0x0fffffd0) == 0x012fff10) {
+		        /*
+			 * bx or blx
+			 */
+			alt = get_user_reg(child, insn & 15);
+			break;
+		}
+
+
 		if ((insn & 0xf000) != 0xf000)
 			break;
 

arch/i386/kernel/kprobes.c

View file

diff --git a/arch/i386/kernel/kprobes.c b/arch/i386/kernel/kprobes.c
index 32b0c24..19edcd5 100644
--- a/arch/i386/kernel/kprobes.c
+++ b/arch/i386/kernel/kprobes.c
@@ -191,7 +191,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
 			 */
 			save_previous_kprobe(kcb);
 			set_current_kprobe(p, regs, kcb);
-			p->nmissed++;
+			kprobes_inc_nmissed_count(p);
 			prepare_singlestep(p, regs);
 			kcb->kprobe_status = KPROBE_REENTER;
 			return 1;

arch/i386/kernel/smpboot.c

View file

diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index d16520d..9ed449a 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -1338,8 +1338,7 @@ int __cpu_disable(void)
 	if (cpu == 0)
 		return -EBUSY;
 
-	/* We enable the timer again on the exit path of the death loop */
-	disable_APIC_timer();
+	clear_local_APIC();
 	/* Allow any queued timer interrupts to get serviced */
 	local_irq_enable();
 	mdelay(1);

arch/i386/kernel/traps.c

View file

diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index c34d1bf..f0dffa0 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -650,13 +650,6 @@ fastcall void do_nmi(struct pt_regs * regs, long error_code)
 
 	cpu = smp_processor_id();
 
-#ifdef CONFIG_HOTPLUG_CPU
-	if (!cpu_online(cpu)) {
-		nmi_exit();
-		return;
-	}
-#endif
-
 	++nmi_count(cpu);
 
 	if (!rcu_dereference(nmi_callback)(regs, cpu))

arch/i386/mm/ioremap.c

View file

diff --git a/arch/i386/mm/ioremap.c b/arch/i386/mm/ioremap.c
index 5d09de8..8498b5a 100644
--- a/arch/i386/mm/ioremap.c
+++ b/arch/i386/mm/ioremap.c
@@ -223,9 +223,15 @@ void __iomem *ioremap_nocache (unsigned long phys_addr, unsigned long size)
 }
 EXPORT_SYMBOL(ioremap_nocache);
 
+/**
+ * iounmap - Free a IO remapping
+ * @addr: virtual address from ioremap_*
+ *
+ * Caller must ensure there is only one unmapping for the same pointer.
+ */
 void iounmap(volatile void __iomem *addr)
 {
-	struct vm_struct *p;
+	struct vm_struct *p, *o;
 
 	if ((void __force *)addr <= high_memory)
 		return;
@@ -239,22 +245,37 @@ void iounmap(volatile void __iomem *addr)
 			addr < phys_to_virt(ISA_END_ADDRESS))
 		return;
 
-	write_lock(&vmlist_lock);
-	p = __remove_vm_area((void *)(PAGE_MASK & (unsigned long __force)addr));
-	if (!p) { 
-		printk(KERN_WARNING "iounmap: bad address %p\n", addr);
+	addr = (volatile void *)(PAGE_MASK & (unsigned long __force)addr);
+
+	/* Use the vm area unlocked, assuming the caller
+	   ensures there isn't another iounmap for the same address
+	   in parallel. Reuse of the virtual address is prevented by
+	   leaving it in the global lists until we're done with it.
+	   cpa takes care of the direct mappings. */
+	read_lock(&vmlist_lock);
+	for (p = vmlist; p; p = p->next) {
+		if (p->addr == addr)
+			break;
+	}
+	read_unlock(&vmlist_lock);
+
+	if (!p) {
+		printk("iounmap: bad address %p\n", addr);
 		dump_stack();
-		goto out_unlock;
+		return;
 	}
 
+	/* Reset the direct mapping. Can block */
 	if ((p->flags >> 20) && p->phys_addr < virt_to_phys(high_memory) - 1) {
 		change_page_attr(virt_to_page(__va(p->phys_addr)),
 				 p->size >> PAGE_SHIFT,
 				 PAGE_KERNEL);
 		global_flush_tlb();
 	} 
-out_unlock:
-	write_unlock(&vmlist_lock);
+
+	/* Finally remove it */
+	o = remove_vm_area((void *)addr);
+	BUG_ON(p != o || o == NULL);
 	kfree(p); 
 }
 EXPORT_SYMBOL(iounmap);

arch/i386/pci/direct.c

View file

diff --git a/arch/i386/pci/direct.c b/arch/i386/pci/direct.c
index 94331d6..e3ac502 100644
--- a/arch/i386/pci/direct.c
+++ b/arch/i386/pci/direct.c
@@ -13,7 +13,7 @@
 #define PCI_CONF1_ADDRESS(bus, devfn, reg) \
 	(0x80000000 | (bus << 16) | (devfn << 8) | (reg & ~3))
 
-static int pci_conf1_read(unsigned int seg, unsigned int bus,
+int pci_conf1_read(unsigned int seg, unsigned int bus,
 			  unsigned int devfn, int reg, int len, u32 *value)
 {
 	unsigned long flags;
@@ -42,7 +42,7 @@ static int pci_conf1_read(unsigned int seg, unsigned int bus,
 	return 0;
 }
 
-static int pci_conf1_write(unsigned int seg, unsigned int bus,
+int pci_conf1_write(unsigned int seg, unsigned int bus,
 			   unsigned int devfn, int reg, int len, u32 value)
 {
 	unsigned long flags;

arch/i386/pci/mmconfig.c

View file

diff --git a/arch/i386/pci/mmconfig.c b/arch/i386/pci/mmconfig.c
index dfbf80c..08a0849 100644
--- a/arch/i386/pci/mmconfig.c
+++ b/arch/i386/pci/mmconfig.c
@@ -19,21 +19,25 @@
 /* The base address of the last MMCONFIG device accessed */
 static u32 mmcfg_last_accessed_device;
 
+static DECLARE_BITMAP(fallback_slots, 32);
+
 /*
  * Functions for accessing PCI configuration space with MMCONFIG accesses
  */
-static u32 get_base_addr(unsigned int seg, int bus)
+static u32 get_base_addr(unsigned int seg, int bus, unsigned devfn)
 {
 	int cfg_num = -1;
 	struct acpi_table_mcfg_config *cfg;
 
+	if (seg == 0 && bus == 0 &&
+	    test_bit(PCI_SLOT(devfn), fallback_slots))
+		return 0;
+
 	while (1) {
 		++cfg_num;
 		if (cfg_num >= pci_mmcfg_config_num) {
-			/* something bad is going on, no cfg table is found. */
-			/* so we fall back to the old way we used to do this */
-			/* and just rely on the first entry to be correct. */
-			return pci_mmcfg_config[0].base_address;
+			/* Not found - fallback to type 1 */
+			return 0;
 		}
 		cfg = &pci_mmcfg_config[cfg_num];
 		if (cfg->pci_segment_group_number != seg)
@@ -44,9 +48,9 @@ static u32 get_base_addr(unsigned int seg, int bus)
 	}
 }
 
-static inline void pci_exp_set_dev_base(unsigned int seg, int bus, int devfn)
+static inline void pci_exp_set_dev_base(unsigned int base, int bus, int devfn)
 {
-	u32 dev_base = get_base_addr(seg, bus) | (bus << 20) | (devfn << 12);
+	u32 dev_base = base | (bus << 20) | (devfn << 12);
 	if (dev_base != mmcfg_last_accessed_device) {
 		mmcfg_last_accessed_device = dev_base;
 		set_fixmap_nocache(FIX_PCIE_MCFG, dev_base);
@@ -57,13 +61,18 @@ static int pci_mmcfg_read(unsigned int seg, unsigned int bus,
 			  unsigned int devfn, int reg, int len, u32 *value)
 {
 	unsigned long flags;
+	u32 base;
 
 	if (!value || (bus > 255) || (devfn > 255) || (reg > 4095))
 		return -EINVAL;
 
+	base = get_base_addr(seg, bus, devfn);
+	if (!base)
+		return pci_conf1_read(seg,bus,devfn,reg,len,value);
+
 	spin_lock_irqsave(&pci_config_lock, flags);
 
-	pci_exp_set_dev_base(seg, bus, devfn);
+	pci_exp_set_dev_base(base, bus, devfn);
 
 	switch (len) {
 	case 1:
@@ -86,13 +95,18 @@ static int pci_mmcfg_write(unsigned int seg, unsigned int bus,
 			   unsigned int devfn, int reg, int len, u32 value)
 {
 	unsigned long flags;
+	u32 base;
 
 	if ((bus > 255) || (devfn > 255) || (reg > 4095)) 
 		return -EINVAL;
 
+	base = get_base_addr(seg, bus, devfn);
+	if (!base)
+		return pci_conf1_write(seg,bus,devfn,reg,len,value);
+
 	spin_lock_irqsave(&pci_config_lock, flags);
 
-	pci_exp_set_dev_base(seg, bus, devfn);
+	pci_exp_set_dev_base(base, bus, devfn);
 
 	switch (len) {
 	case 1:
@@ -116,6 +130,37 @@ static struct pci_raw_ops pci_mmcfg = {
 	.write =	pci_mmcfg_write,
 };
 
+/* K8 systems have some devices (typically in the builtin northbridge)
+   that are only accessible using type1
+   Normally this can be expressed in the MCFG by not listing them
+   and assigning suitable _SEGs, but this isn't implemented in some BIOS.
+   Instead try to discover all devices on bus 0 that are unreachable using MM
+   and fallback for them.
+   We only do this for bus 0/seg 0 */
+static __init void unreachable_devices(void)
+{
+	int i;
+	unsigned long flags;
+
+	for (i = 0; i < 32; i++) {
+		u32 val1;
+		u32 addr;
+
+		pci_conf1_read(0, 0, PCI_DEVFN(i, 0), 0, 4, &val1);
+		if (val1 == 0xffffffff)
+			continue;
+
+		/* Locking probably not needed, but safer */
+		spin_lock_irqsave(&pci_config_lock, flags);
+		addr = get_base_addr(0, 0, PCI_DEVFN(i, 0));
+		if (addr != 0)
+			pci_exp_set_dev_base(addr, 0, PCI_DEVFN(i, 0));
+		if (addr == 0 || readl((u32 *)addr) != val1)
+			set_bit(i, fallback_slots);
+		spin_unlock_irqrestore(&pci_config_lock, flags);
+	}
+}
+
 static int __init pci_mmcfg_init(void)
 {
 	if ((pci_probe & PCI_PROBE_MMCONF) == 0)
@@ -131,6 +176,8 @@ static int __init pci_mmcfg_init(void)
 	raw_pci_ops = &pci_mmcfg;
 	pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF;
 
+	unreachable_devices();
+
  out:
 	return 0;
 }

arch/i386/pci/pci.h

View file

diff --git a/arch/i386/pci/pci.h b/arch/i386/pci/pci.h
index 127d53a..f550781 100644
--- a/arch/i386/pci/pci.h
+++ b/arch/i386/pci/pci.h
@@ -74,3 +74,10 @@ extern spinlock_t pci_config_lock;
 
 extern int (*pcibios_enable_irq)(struct pci_dev *dev);
 extern void (*pcibios_disable_irq)(struct pci_dev *dev);
+
+extern int pci_conf1_write(unsigned int seg, unsigned int bus,
+			   unsigned int devfn, int reg, int len, u32 value);
+extern int pci_conf1_read(unsigned int seg, unsigned int bus,
+			  unsigned int devfn, int reg, int len, u32 *value);
+
+

arch/ia64/Kconfig

View file

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index b76ce1f..199eeaf 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -58,7 +58,7 @@ config IA64_UNCACHED_ALLOCATOR
 	bool
 	select GENERIC_ALLOCATOR
 
-config ZONE_DMA_IS_DMA32
+config DMA_IS_DMA32
 	bool
 	default y
 

arch/ia64/configs/sn2_defconfig

View file

diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig
index 87cfd31..e1924cc 100644
--- a/arch/ia64/configs/sn2_defconfig
+++ b/arch/ia64/configs/sn2_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.13-rc6
-# Tue Aug 16 14:40:41 2005
+# Linux kernel version: 2.6.15-rc4
+# Fri Dec  2 10:33:48 2005
 #
 

This diff is incomplete. Download the complete patch.