From 1a538830e27f8d74321f702d3d58a2da46ee43fc Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Mon, 14 May 2007 16:50:44 -0400 Subject: [PATCH] --- yaml --- r: 56561 b: refs/heads/master c: 21051ba6259c519e20a7d575ddceb16e84ad2a5d h: refs/heads/master i: 56559: c15829b2704582eb145db88da896f5cd44e5140d v: v3 --- [refs] | 2 +- .../Documentation/DocBook/kernel-locking.tmpl | 123 ++-- .../feature-removal-schedule.txt | 25 +- trunk/Documentation/gpio.txt | 8 +- trunk/Documentation/networking/netdevices.txt | 2 +- trunk/Documentation/vm/slabinfo.c | 17 +- trunk/MAINTAINERS | 5 +- trunk/arch/arm/kernel/stacktrace.c | 2 - trunk/arch/avr32/boards/atstk1000/atstk1000.h | 15 - trunk/arch/avr32/boards/atstk1000/atstk1002.c | 10 +- trunk/arch/avr32/boards/atstk1000/setup.c | 45 +- trunk/arch/avr32/kernel/irq.c | 9 + trunk/arch/avr32/kernel/kprobes.c | 7 +- trunk/arch/avr32/kernel/syscall_table.S | 3 - trunk/arch/avr32/mach-at32ap/at32ap7000.c | 77 +-- trunk/arch/avr32/mm/fault.c | 36 +- trunk/arch/blackfin/Kconfig | 8 + trunk/arch/frv/Kconfig | 8 + trunk/arch/i386/kernel/Makefile | 1 - .../i386/kernel/cpu/cpufreq/powernow-k7.c | 36 +- .../i386/kernel/cpu/cpufreq/powernow-k8.c | 2 +- .../i386/kernel/cpu/cpufreq/powernow-k8.h | 4 +- trunk/arch/i386/kernel/cpu/mtrr/generic.c | 2 +- trunk/arch/i386/kernel/cpu/mtrr/main.c | 2 +- trunk/arch/i386/kernel/smp.c | 67 ++- trunk/arch/i386/kernel/smpboot.c | 22 + trunk/arch/i386/kernel/smpcommon.c | 79 --- trunk/arch/i386/mach-voyager/voyager_smp.c | 106 ++-- trunk/arch/i386/mm/discontig.c | 9 +- trunk/arch/ia64/kernel/acpi.c | 2 +- trunk/arch/ia64/kernel/crash.c | 24 +- trunk/arch/ia64/kernel/entry.S | 3 - trunk/arch/ia64/kernel/irq.c | 6 +- trunk/arch/ia64/kernel/irq_lsapic.c | 2 +- trunk/arch/ia64/kernel/kprobes.c | 15 +- trunk/arch/ia64/kernel/mca.c | 5 +- trunk/arch/ia64/kernel/mca_drv.c | 4 +- trunk/arch/ia64/kernel/module.c | 2 +- trunk/arch/ia64/kernel/perfmon.c | 18 +- trunk/arch/ia64/kernel/perfmon_mckinley.h | 2 +- trunk/arch/ia64/kernel/sal.c | 2 +- trunk/arch/ia64/kernel/salinfo.c | 2 +- trunk/arch/ia64/kernel/setup.c | 6 +- trunk/arch/ia64/kernel/smp.c | 12 +- trunk/arch/ia64/kernel/smpboot.c | 6 +- trunk/arch/ia64/kernel/traps.c | 2 +- trunk/arch/ia64/kernel/unwind.c | 2 +- trunk/arch/ia64/mm/discontig.c | 2 +- trunk/arch/ia64/mm/fault.c | 41 +- trunk/arch/ia64/sn/kernel/bte.c | 12 +- trunk/arch/ia64/sn/kernel/bte_error.c | 4 +- trunk/arch/ia64/sn/kernel/io_common.c | 2 +- trunk/arch/ia64/sn/kernel/setup.c | 2 +- trunk/arch/ia64/sn/kernel/sn2/sn2_smp.c | 2 +- trunk/arch/ia64/sn/kernel/xpc_channel.c | 8 +- trunk/arch/ia64/sn/kernel/xpnet.c | 2 +- trunk/arch/ia64/sn/pci/pci_dma.c | 8 +- trunk/arch/ia64/sn/pci/pcibr/pcibr_ate.c | 6 +- trunk/arch/ia64/sn/pci/pcibr/pcibr_dma.c | 2 +- trunk/arch/ia64/sn/pci/tioca_provider.c | 6 +- trunk/arch/ia64/sn/pci/tioce_provider.c | 16 +- trunk/arch/m68k/lib/uaccess.c | 4 +- trunk/arch/m68knommu/Kconfig | 8 + .../arch/powerpc/platforms/cell/spufs/inode.c | 4 +- trunk/arch/sh64/Kconfig | 3 - trunk/arch/sh64/configs/cayman_defconfig | 199 +++---- trunk/arch/sh64/kernel/entry.S | 4 +- trunk/arch/sh64/kernel/irq.c | 4 +- trunk/arch/sh64/kernel/pci_sh5.c | 17 +- trunk/arch/sh64/kernel/pci_sh5.h | 2 +- trunk/arch/sh64/kernel/process.c | 2 +- trunk/arch/sh64/kernel/signal.c | 33 +- trunk/arch/sh64/kernel/syscalls.S | 36 +- trunk/arch/sh64/kernel/time.c | 18 +- trunk/arch/sh64/lib/.gitignore | 1 - trunk/arch/sh64/mach-cayman/irq.c | 4 +- trunk/arch/sh64/mach-cayman/setup.c | 2 +- trunk/arch/sh64/mm/fault.c | 2 +- trunk/arch/sh64/mm/init.c | 2 +- trunk/arch/sh64/mm/tlbmiss.c | 4 +- trunk/arch/sparc64/kernel/Makefile | 2 +- trunk/arch/sparc64/kernel/entry.S | 94 --- trunk/arch/sparc64/kernel/hvapi.c | 189 ------ trunk/arch/sparc64/kernel/setup.c | 3 - .../um/include/sysdep-x86_64/kernel-offsets.h | 9 - .../arch/um/include/sysdep-x86_64/syscalls.h | 3 +- trunk/arch/um/sys-x86_64/syscall_table.c | 5 +- trunk/arch/v850/Kconfig | 8 + trunk/block/ll_rw_blk.c | 1 + trunk/drivers/acpi/numa.c | 8 +- trunk/drivers/ata/ahci.c | 3 +- trunk/drivers/ata/libata-acpi.c | 10 +- trunk/drivers/ata/libata-core.c | 86 ++- trunk/drivers/ata/libata-scsi.c | 45 +- trunk/drivers/ata/libata.h | 4 +- trunk/drivers/ata/pata_scc.c | 4 +- trunk/drivers/ata/sata_nv.c | 18 +- trunk/drivers/ata/sata_sil24.c | 3 +- trunk/drivers/ata/sata_via.c | 2 +- trunk/drivers/char/agp/via-agp.c | 6 +- trunk/drivers/firewire/fw-ohci.c | 1 - trunk/drivers/ide/Kconfig | 15 +- trunk/drivers/ide/cris/ide-cris.c | 14 +- trunk/drivers/ide/ide-dma.c | 53 +- trunk/drivers/ide/ide-io.c | 1 - trunk/drivers/ide/ide-lib.c | 12 + trunk/drivers/ide/ide.c | 1 - trunk/drivers/ide/pci/alim15x3.c | 69 ++- trunk/drivers/ide/pci/cmd64x.c | 15 +- trunk/drivers/ide/pci/cs5530.c | 160 ++--- trunk/drivers/ide/pci/it821x.c | 21 +- trunk/drivers/ide/pci/pdc202xx_new.c | 29 +- trunk/drivers/ide/pci/pdc202xx_old.c | 184 ++++-- trunk/drivers/ide/pci/sc1200.c | 161 ++--- trunk/drivers/ide/pci/scc_pata.c | 22 +- trunk/drivers/ide/pci/serverworks.c | 77 ++- trunk/drivers/ide/pci/siimage.c | 24 +- trunk/drivers/ide/pci/sis5513.c | 85 +-- trunk/drivers/ide/pci/sl82c105.c | 76 +-- trunk/drivers/infiniband/core/cma.c | 106 ++-- .../drivers/infiniband/hw/ehca/ehca_classes.h | 1 - trunk/drivers/infiniband/hw/ehca/ehca_irq.c | 7 +- trunk/drivers/infiniband/hw/ehca/ehca_main.c | 94 +-- trunk/drivers/infiniband/hw/ehca/ehca_qp.c | 17 +- trunk/drivers/infiniband/hw/ehca/hcp_if.c | 13 +- .../infiniband/hw/ipath/ipath_iba6120.c | 7 +- .../drivers/infiniband/hw/ipath/ipath_intr.c | 7 +- .../infiniband/hw/ipath/ipath_kernel.h | 2 - .../drivers/infiniband/hw/ipath/ipath_verbs.c | 12 +- trunk/drivers/infiniband/hw/mlx4/main.c | 1 - trunk/drivers/infiniband/hw/mthca/mthca_cq.c | 4 +- trunk/drivers/infiniband/hw/mthca/mthca_qp.c | 1 - trunk/drivers/infiniband/ulp/ipoib/ipoib_cm.c | 11 +- trunk/drivers/input/joystick/Kconfig | 1 - trunk/drivers/input/misc/Kconfig | 5 - trunk/drivers/input/mouse/Kconfig | 1 - trunk/drivers/input/tablet/Kconfig | 4 - trunk/drivers/input/touchscreen/Kconfig | 1 - trunk/drivers/media/video/em28xx/Kconfig | 2 +- trunk/drivers/media/video/ivtv/Kconfig | 2 +- trunk/drivers/mtd/ubi/eba.c | 3 + trunk/drivers/net/Kconfig | 1 - trunk/drivers/net/e1000/e1000.h | 4 +- trunk/drivers/net/e1000/e1000_main.c | 39 +- trunk/drivers/net/gianfar.c | 11 - trunk/drivers/net/ibm_emac/ibm_emac_core.c | 2 +- trunk/drivers/net/ibm_emac/ibm_emac_mal.c | 3 +- trunk/drivers/net/ibm_emac/ibm_emac_mal.h | 3 +- trunk/drivers/net/ibm_emac/ibm_emac_phy.c | 60 +- trunk/drivers/net/ibm_emac/ibm_emac_rgmii.c | 2 +- trunk/drivers/net/ibm_emac/ibm_emac_rgmii.h | 2 +- trunk/drivers/net/ibm_emac/ibm_emac_tah.c | 2 +- trunk/drivers/net/ibm_emac/ibm_emac_tah.h | 2 +- trunk/drivers/net/ibm_emac/ibm_emac_zmii.c | 2 +- trunk/drivers/net/ibm_emac/ibm_emac_zmii.h | 2 +- trunk/drivers/net/ixgb/ixgb.h | 2 + trunk/drivers/net/ixgb/ixgb_main.c | 36 +- trunk/drivers/net/mlx4/alloc.c | 1 - trunk/drivers/net/mlx4/eq.c | 1 - trunk/drivers/net/mlx4/icm.c | 1 - trunk/drivers/net/mlx4/main.c | 2 + trunk/drivers/net/mlx4/mlx4.h | 1 + trunk/drivers/net/mlx4/reset.c | 1 - trunk/drivers/net/netxen/netxen_nic_init.c | 2 +- trunk/drivers/net/pasemi_mac.c | 45 +- trunk/drivers/net/pasemi_mac.h | 4 +- trunk/drivers/net/sky2.c | 69 ++- trunk/drivers/net/smc911x.c | 6 +- trunk/drivers/net/spider_net.c | 3 +- trunk/drivers/net/ucc_geth.c | 40 +- trunk/drivers/net/ucc_geth_mii.c | 9 +- trunk/drivers/net/ucc_geth_mii.h | 10 +- trunk/drivers/parport/parport_pc.c | 1 - trunk/drivers/pci/hotplug/rpadlpar_sysfs.c | 5 +- trunk/drivers/rtc/Kconfig | 6 +- trunk/drivers/rtc/rtc-omap.c | 4 +- trunk/drivers/serial/8250.c | 21 +- trunk/drivers/serial/icom.c | 55 +- trunk/drivers/serial/sunhv.c | 276 +++------ trunk/drivers/spi/spidev.c | 2 +- trunk/drivers/video/console/vgacon.c | 9 +- trunk/fs/adfs/super.c | 3 +- trunk/fs/affs/super.c | 8 +- trunk/fs/afs/super.c | 21 +- trunk/fs/afs/write.c | 3 +- trunk/fs/befs/linuxvfs.c | 6 +- trunk/fs/bfs/inode.c | 3 +- trunk/fs/block_dev.c | 16 +- trunk/fs/buffer.c | 25 +- trunk/fs/cifs/cifsfs.c | 6 +- trunk/fs/coda/inode.c | 3 +- trunk/fs/compat.c | 13 +- trunk/fs/dquot.c | 2 +- trunk/fs/ecryptfs/main.c | 3 +- trunk/fs/ecryptfs/mmap.c | 14 +- trunk/fs/efs/super.c | 3 +- trunk/fs/eventpoll.c | 561 ++++++++++-------- trunk/fs/exec.c | 4 +- trunk/fs/ext2/super.c | 8 +- trunk/fs/ext3/super.c | 10 +- trunk/fs/ext4/super.c | 10 +- trunk/fs/fat/cache.c | 3 +- trunk/fs/fat/inode.c | 14 +- trunk/fs/fuse/inode.c | 3 +- trunk/fs/gfs2/main.c | 34 +- trunk/fs/hfs/super.c | 3 +- trunk/fs/hfsplus/super.c | 3 +- trunk/fs/hpfs/super.c | 8 +- trunk/fs/hugetlbfs/inode.c | 3 +- trunk/fs/inode.c | 3 +- trunk/fs/isofs/inode.c | 3 +- trunk/fs/jffs2/super.c | 6 +- trunk/fs/jfs/jfs_metapage.c | 18 +- trunk/fs/jfs/super.c | 22 +- trunk/fs/lockd/host.c | 2 +- trunk/fs/locks.c | 3 + trunk/fs/minix/inode.c | 3 +- trunk/fs/ncpfs/inode.c | 6 +- trunk/fs/nfs/inode.c | 28 +- trunk/fs/ntfs/super.c | 3 +- trunk/fs/ocfs2/dlm/dlmfs.c | 8 +- trunk/fs/ocfs2/super.c | 38 +- trunk/fs/openpromfs/inode.c | 3 +- trunk/fs/proc/inode.c | 3 +- trunk/fs/qnx4/inode.c | 3 +- trunk/fs/quota.c | 23 +- trunk/fs/reiserfs/super.c | 10 +- trunk/fs/romfs/inode.c | 7 +- trunk/fs/smbfs/inode.c | 3 +- trunk/fs/sysv/inode.c | 3 +- trunk/fs/udf/super.c | 6 +- trunk/fs/ufs/super.c | 3 +- trunk/fs/xfs/linux-2.6/xfs_super.c | 3 +- trunk/include/acpi/acpi_numa.h | 7 +- trunk/include/asm-alpha/mmu_context.h | 2 +- trunk/include/asm-avr32/arch-at32ap/board.h | 8 +- trunk/include/asm-avr32/kdebug.h | 17 +- trunk/include/asm-avr32/kprobes.h | 1 - trunk/include/asm-avr32/unistd.h | 5 +- trunk/include/asm-h8300/atomic.h | 1 - trunk/include/asm-i386/processor.h | 4 - trunk/include/asm-ia64/kdebug.h | 16 +- trunk/include/asm-ia64/kprobes.h | 1 - trunk/include/asm-ia64/unistd.h | 5 +- trunk/include/asm-m32r/system.h | 3 +- trunk/include/asm-m68k/uaccess.h | 4 +- trunk/include/asm-sh64/dma-mapping.h | 14 +- trunk/include/asm-sh64/irq_regs.h | 1 - trunk/include/asm-sh64/pgalloc.h | 100 +++- trunk/include/asm-sh64/sci.h | 1 - trunk/include/asm-sh64/thread_info.h | 6 - trunk/include/asm-sh64/unistd.h | 43 +- trunk/include/asm-sparc64/hypervisor.h | 83 +-- trunk/include/linux/binfmts.h | 2 - trunk/include/linux/ide.h | 3 + trunk/include/linux/init.h | 7 +- trunk/include/linux/io.h | 8 - trunk/include/linux/kmalloc_sizes.h | 20 +- trunk/include/linux/libata.h | 3 +- trunk/include/linux/pci_ids.h | 2 - trunk/include/linux/rmap.h | 13 +- trunk/include/linux/slab.h | 21 +- trunk/include/linux/slab_def.h | 3 - trunk/include/linux/slub_def.h | 27 +- trunk/include/linux/smp.h | 7 +- trunk/include/linux/workqueue.h | 2 +- trunk/include/sound/soc.h | 4 +- trunk/include/sound/version.h | 2 +- trunk/init/Kconfig | 8 +- trunk/ipc/mqueue.c | 3 +- trunk/kernel/auditfilter.c | 2 - trunk/kernel/fork.c | 6 +- trunk/kernel/power/disk.c | 3 +- trunk/kernel/power/main.c | 19 +- trunk/kernel/sysctl.c | 2 +- trunk/kernel/time/clocksource.c | 10 +- trunk/mm/Kconfig | 2 +- trunk/mm/filemap.c | 3 +- trunk/mm/memory.c | 2 +- trunk/mm/rmap.c | 66 +-- trunk/mm/shmem.c | 8 +- trunk/mm/slab.c | 57 +- trunk/mm/slob.c | 53 +- trunk/mm/slub.c | 234 ++++---- trunk/mm/vmalloc.c | 2 +- trunk/net/ipx/af_ipx.c | 2 +- trunk/net/socket.c | 3 +- trunk/net/sunrpc/rpc_pipe.c | 24 +- trunk/sound/isa/cmi8330.c | 15 +- trunk/sound/isa/cs423x/cs4236.c | 20 +- trunk/sound/isa/es18xx.c | 19 +- trunk/sound/isa/gus/interwave.c | 15 +- trunk/sound/isa/opl3sa2.c | 15 +- trunk/sound/isa/sb/sb16.c | 15 +- trunk/sound/isa/sscape.c | 28 +- trunk/sound/isa/wavefront/wavefront.c | 14 +- trunk/sound/pci/ac97/ac97_patch.c | 5 - trunk/sound/pci/hda/hda_codec.c | 3 +- trunk/sound/pci/hda/patch_realtek.c | 532 +---------------- trunk/sound/pci/hda/patch_sigmatel.c | 2 - trunk/sound/pci/intel8x0.c | 20 +- trunk/sound/soc/codecs/ac97.c | 3 +- trunk/sound/soc/codecs/wm9712.c | 1 - trunk/sound/soc/soc-core.c | 18 +- trunk/sound/usb/usbmixer.c | 2 +- trunk/sound/usb/usbquirks.h | 9 - 306 files changed, 2817 insertions(+), 3758 deletions(-) delete mode 100644 trunk/arch/avr32/boards/atstk1000/atstk1000.h delete mode 100644 trunk/arch/i386/kernel/smpcommon.c delete mode 100644 trunk/arch/sh64/lib/.gitignore delete mode 100644 trunk/arch/sparc64/kernel/hvapi.c delete mode 100644 trunk/include/asm-sh64/irq_regs.h delete mode 100644 trunk/include/asm-sh64/sci.h diff --git a/[refs] b/[refs] index 288fdf3ee083..ef7845e7f8d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3a36fb82a0864a85e238ac946817030a18c5f9a +refs/heads/master: 21051ba6259c519e20a7d575ddceb16e84ad2a5d diff --git a/trunk/Documentation/DocBook/kernel-locking.tmpl b/trunk/Documentation/DocBook/kernel-locking.tmpl index 0a441f73261a..644c3884fab9 100644 --- a/trunk/Documentation/DocBook/kernel-locking.tmpl +++ b/trunk/Documentation/DocBook/kernel-locking.tmpl @@ -551,12 +551,10 @@ spin_lock_irqsave(), which is a superset of all other spinlock primitives. - Table of Locking Requirements - IRQ Handler A @@ -578,128 +576,97 @@ IRQ Handler B -SLIS +spin_lock_irqsave None Softirq A -SLI -SLI -SL +spin_lock_irq +spin_lock_irq +spin_lock Softirq B -SLI -SLI -SL -SL +spin_lock_irq +spin_lock_irq +spin_lock +spin_lock Tasklet A -SLI -SLI -SL -SL +spin_lock_irq +spin_lock_irq +spin_lock +spin_lock None Tasklet B -SLI -SLI -SL -SL -SL +spin_lock_irq +spin_lock_irq +spin_lock +spin_lock +spin_lock None Timer A -SLI -SLI -SL -SL -SL -SL +spin_lock_irq +spin_lock_irq +spin_lock +spin_lock +spin_lock +spin_lock None Timer B -SLI -SLI -SL -SL -SL -SL -SL +spin_lock_irq +spin_lock_irq +spin_lock +spin_lock +spin_lock +spin_lock +spin_lock None User Context A -SLI -SLI -SLBH -SLBH -SLBH -SLBH -SLBH -SLBH +spin_lock_irq +spin_lock_irq +spin_lock_bh +spin_lock_bh +spin_lock_bh +spin_lock_bh +spin_lock_bh +spin_lock_bh None User Context B -SLI -SLI -SLBH -SLBH -SLBH -SLBH -SLBH -SLBH -DI -None - - - - -
- - -Legend for Locking Requirements Table - - - - -SLIS -spin_lock_irqsave - - -SLI spin_lock_irq - - -SL -spin_lock - - -SLBH +spin_lock_irq +spin_lock_bh +spin_lock_bh +spin_lock_bh +spin_lock_bh +spin_lock_bh spin_lock_bh - - -DI down_interruptible +None
- diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index 5c8695a3d139..498ff31f3aa1 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -328,20 +328,21 @@ Who: Adrian Bunk --------------------------- -What: libata spindown skipping and warning +What: libata.spindown_compat module parameter When: Dec 2008 -Why: Some halt(8) implementations synchronize caches for and spin - down libata disks because libata didn't use to spin down disk on - system halt (only synchronized caches). - Spin down on system halt is now implemented. sysfs node - /sys/class/scsi_disk/h:c:i:l/manage_start_stop is present if - spin down support is available. +Why: halt(8) synchronizes caches for and spins down libata disks + because libata didn't use to spin down disk on system halt + (only synchronized caches). + Spin down on system halt is now implemented and can be tested + using sysfs node /sys/class/scsi_disk/h:c:i:l/manage_start_stop. Because issuing spin down command to an already spun down disk - makes some disks spin up just to spin down again, libata tracks - device spindown status to skip the extra spindown command and - warn about it. - This is to give userspace tools the time to get updated and will - be removed after userspace is reasonably updated. + makes some disks spin up just to spin down again, the old + behavior needs to be maintained till userspace tool is updated + to check the sysfs node and not to spin down disks with the + node set to one. + This module parameter is to give userspace tool the time to + get updated and should be removed after userspace is + reasonably updated. Who: Tejun Heo --------------------------- diff --git a/trunk/Documentation/gpio.txt b/trunk/Documentation/gpio.txt index 36af58eba136..e8be0abb346c 100644 --- a/trunk/Documentation/gpio.txt +++ b/trunk/Documentation/gpio.txt @@ -111,9 +111,7 @@ setting up a platform_device using the GPIO, is mark its direction: The return value is zero for success, else a negative errno. It should be checked, since the get/set calls don't have error returns and since -misconfiguration is possible. You should normally issue these calls from -a task context. However, for spinlock-safe GPIOs it's OK to use them -before tasking is enabled, as part of early board setup. +misconfiguration is possible. (These calls could sleep.) For output GPIOs, the value provided becomes the initial output value. This helps avoid signal glitching during system startup. @@ -199,9 +197,7 @@ However, many platforms don't currently support this mechanism. Passing invalid GPIO numbers to gpio_request() will fail, as will requesting GPIOs that have already been claimed with that call. The return value of -gpio_request() must be checked. You should normally issue these calls from -a task context. However, for spinlock-safe GPIOs it's OK to request GPIOs -before tasking is enabled, as part of early board setup. +gpio_request() must be checked. (These calls could sleep.) These calls serve two basic purposes. One is marking the signals which are actually in use as GPIOs, for better diagnostics; systems may have diff --git a/trunk/Documentation/networking/netdevices.txt b/trunk/Documentation/networking/netdevices.txt index ce1361f95243..847cedb238f6 100644 --- a/trunk/Documentation/networking/netdevices.txt +++ b/trunk/Documentation/networking/netdevices.txt @@ -49,7 +49,7 @@ dev->hard_start_xmit: for this and return -1 when the spin lock fails. The locking there should also properly protect against set_multicast_list - Context: Process with BHs disabled or BH (timer). + Context: BHs disabled Notes: netif_queue_stopped() is guaranteed false Interrupts must be enabled when calling hard_start_xmit. (Interrupts must also be enabled when enabling the BH handler.) diff --git a/trunk/Documentation/vm/slabinfo.c b/trunk/Documentation/vm/slabinfo.c index 434af27a32ac..686a8e04a4f3 100644 --- a/trunk/Documentation/vm/slabinfo.c +++ b/trunk/Documentation/vm/slabinfo.c @@ -242,9 +242,6 @@ void decode_numa_list(int *numa, char *t) memset(numa, 0, MAX_NODES * sizeof(int)); - if (!t) - return; - while (*t == 'N') { t++; node = strtoul(t, &t, 10); @@ -389,9 +386,7 @@ void report(struct slabinfo *s) { if (strcmp(s->name, "*") == 0) return; - - printf("\nSlabcache: %-20s Aliases: %2d Order : %2d Objects: %d\n", - s->name, s->aliases, s->order, s->objects); + printf("\nSlabcache: %-20s Aliases: %2d Order : %2d\n", s->name, s->aliases, s->order); if (s->hwcache_align) printf("** Hardware cacheline aligned\n"); if (s->cache_dma) @@ -796,11 +791,11 @@ void totals(void) store_size(b1, total_size);store_size(b2, total_waste); store_size(b3, total_waste * 100 / total_used); - printf("Memory used: %6s # Loss : %6s MRatio:%6s%%\n", b1, b2, b3); + printf("Memory used: %6s # Loss : %6s MRatio: %6s%%\n", b1, b2, b3); store_size(b1, total_objects);store_size(b2, total_partobj); store_size(b3, total_partobj * 100 / total_objects); - printf("# Objects : %6s # PartObj: %6s ORatio:%6s%%\n", b1, b2, b3); + printf("# Objects : %6s # PartObj: %6s ORatio: %6s%%\n", b1, b2, b3); printf("\n"); printf("Per Cache Average Min Max Total\n"); @@ -823,7 +818,7 @@ void totals(void) store_size(b1, avg_ppart);store_size(b2, min_ppart); store_size(b3, max_ppart); store_size(b4, total_partial * 100 / total_slabs); - printf("%%PartSlab%10s%% %10s%% %10s%% %10s%%\n", + printf("%%PartSlab %10s%% %10s%% %10s%% %10s%%\n", b1, b2, b3, b4); store_size(b1, avg_partobj);store_size(b2, min_partobj); @@ -835,7 +830,7 @@ void totals(void) store_size(b1, avg_ppartobj);store_size(b2, min_ppartobj); store_size(b3, max_ppartobj); store_size(b4, total_partobj * 100 / total_objects); - printf("%% PartObj%10s%% %10s%% %10s%% %10s%%\n", + printf("%% PartObj %10s%% %10s%% %10s%% %10s%%\n", b1, b2, b3, b4); store_size(b1, avg_size);store_size(b2, min_size); @@ -1105,8 +1100,6 @@ void output_slabs(void) ops(slab); else if (show_slab) slabcache(slab); - else if (show_report) - report(slab); } } diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 4c3277cb925e..21f3fff5432f 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2689,13 +2689,13 @@ L: i2c@lm-sensors.org S: Maintained PARALLEL PORT SUPPORT -L: linux-parport@lists.infradead.org (subscribers-only) +L: linux-parport@lists.infradead.org S: Orphan PARIDE DRIVERS FOR PARALLEL PORT IDE DEVICES P: Tim Waugh M: tim@cyberelk.net -L: linux-parport@lists.infradead.org (subscribers-only) +L: linux-parport@lists.infradead.org W: http://www.torque.net/linux-pp.html S: Maintained @@ -3267,7 +3267,6 @@ W: http://tpmdd.sourceforge.net P: Marcel Selhorst M: tpm@selhorst.net W: http://www.prosec.rub.de/tpm/ -L: tpmdd-devel@lists.sourceforge.net S: Maintained Telecom Clock Driver for MCPL0010 diff --git a/trunk/arch/arm/kernel/stacktrace.c b/trunk/arch/arm/kernel/stacktrace.c index 8b63ad89d0a8..398d0c0511eb 100644 --- a/trunk/arch/arm/kernel/stacktrace.c +++ b/trunk/arch/arm/kernel/stacktrace.c @@ -1,4 +1,3 @@ -#include #include #include @@ -31,7 +30,6 @@ int walk_stackframe(unsigned long fp, unsigned long low, unsigned long high, return 0; } -EXPORT_SYMBOL(walk_stackframe); #ifdef CONFIG_STACKTRACE struct stack_trace_data { diff --git a/trunk/arch/avr32/boards/atstk1000/atstk1000.h b/trunk/arch/avr32/boards/atstk1000/atstk1000.h deleted file mode 100644 index 9a49ed036b72..000000000000 --- a/trunk/arch/avr32/boards/atstk1000/atstk1000.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * ATSTK1000 setup code: Daughterboard interface - * - * Copyright (C) 2007 Atmel Corporation - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ -#ifndef __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H -#define __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H - -extern struct atmel_lcdfb_info atstk1000_lcdc_data; - -#endif /* __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H */ diff --git a/trunk/arch/avr32/boards/atstk1000/atstk1002.c b/trunk/arch/avr32/boards/atstk1000/atstk1002.c index fe1dbe2e28f4..abe6ca203fa7 100644 --- a/trunk/arch/avr32/boards/atstk1000/atstk1002.c +++ b/trunk/arch/avr32/boards/atstk1000/atstk1002.c @@ -16,8 +16,6 @@ #include #include -#include