kernel.git
10 years ago[PATCH] get rid of blkdev_locked_ioctl()
Al Viro [Thu, 18 Sep 2008 19:53:24 +0000 (15:53 -0400)]
[PATCH] get rid of blkdev_locked_ioctl()

Most of that stuff doesn't need BKL at all; expand in the (only) caller,
merge the switch into one there and leave BKL only around the stuff that
might actually need it.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] get rid of blkdev_driver_ioctl()
Al Viro [Thu, 18 Sep 2008 07:38:12 +0000 (03:38 -0400)]
[PATCH] get rid of blkdev_driver_ioctl()

convert remaining callers to __blkdev_driver_ioctl()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] sanitize blkdev_get() and friends
Al Viro [Mon, 8 Oct 2007 17:24:05 +0000 (13:24 -0400)]
[PATCH] sanitize blkdev_get() and friends

* get rid of fake struct file/struct dentry in __blkdev_get()
* merge __blkdev_get() and do_open()
* get rid of flags argument of blkdev_get()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] remember mode of reiserfs journal
Al Viro [Mon, 8 Oct 2007 17:24:05 +0000 (13:24 -0400)]
[PATCH] remember mode of reiserfs journal

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] propagate mode through swsusp_close()
Al Viro [Mon, 8 Oct 2007 17:21:10 +0000 (13:21 -0400)]
[PATCH] propagate mode through swsusp_close()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] propagate mode through open_bdev_excl/close_bdev_excl
Al Viro [Sat, 23 Feb 2008 00:50:45 +0000 (19:50 -0500)]
[PATCH] propagate mode through open_bdev_excl/close_bdev_excl

replace open_bdev_excl/close_bdev_excl with variants taking fmode_t.
superblock gets the value used to mount it stored in sb->s_mode

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] pass fmode_t to blkdev_put()
Al Viro [Sat, 23 Feb 2008 01:40:24 +0000 (20:40 -0500)]
[PATCH] pass fmode_t to blkdev_put()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] kill the unused bsize on the send side of /dev/loop
Al Viro [Mon, 8 Oct 2007 16:10:13 +0000 (12:10 -0400)]
[PATCH] kill the unused bsize on the send side of /dev/loop

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] trim file propagation in block/compat_ioctl.c
Al Viro [Sat, 23 Feb 2008 03:02:50 +0000 (22:02 -0500)]
[PATCH] trim file propagation in block/compat_ioctl.c

... and remove the handling of cases when it falls back to native
without changing arguments.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] end of methods switch: remove the old ones
Al Viro [Sun, 2 Mar 2008 15:43:36 +0000 (10:43 -0500)]
[PATCH] end of methods switch: remove the old ones

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch sr
Al Viro [Sun, 2 Mar 2008 15:41:28 +0000 (10:41 -0500)]
[PATCH] switch sr

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch sd
Al Viro [Sun, 2 Mar 2008 15:41:04 +0000 (10:41 -0500)]
[PATCH] switch sd

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch ide-scsi
Al Viro [Sun, 2 Mar 2008 15:40:39 +0000 (10:40 -0500)]
[PATCH] switch ide-scsi

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch tape_block
Al Viro [Sun, 2 Mar 2008 15:39:59 +0000 (10:39 -0500)]
[PATCH] switch tape_block

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch dcssblk
Al Viro [Sun, 2 Mar 2008 15:37:41 +0000 (10:37 -0500)]
[PATCH] switch dcssblk

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch dasd
Al Viro [Sun, 2 Mar 2008 15:36:08 +0000 (10:36 -0500)]
[PATCH] switch dasd

->compat_ioctl() actually had been useless here; generic
logics works fine.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch mtd_blkdevs
Al Viro [Sun, 2 Mar 2008 15:35:06 +0000 (10:35 -0500)]
[PATCH] switch mtd_blkdevs

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch mmc
Al Viro [Sun, 2 Mar 2008 15:33:30 +0000 (10:33 -0500)]
[PATCH] switch mmc

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch i2o
Al Viro [Sun, 2 Mar 2008 15:33:08 +0000 (10:33 -0500)]
[PATCH] switch i2o

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch memstick
Al Viro [Sun, 2 Mar 2008 15:31:38 +0000 (10:31 -0500)]
[PATCH] switch memstick

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch md
Al Viro [Sun, 2 Mar 2008 15:31:15 +0000 (10:31 -0500)]
[PATCH] switch md

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch dm
Al Viro [Sun, 2 Mar 2008 15:29:31 +0000 (10:29 -0500)]
[PATCH] switch dm

ioctl() doesn't need BKL here

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch ide-tape
Al Viro [Sun, 2 Mar 2008 15:27:58 +0000 (10:27 -0500)]
[PATCH] switch ide-tape

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch ide-gd
Al Viro [Thu, 16 Oct 2008 14:34:00 +0000 (10:34 -0400)]
[PATCH] switch ide-gd

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch ide-cd
Al Viro [Sun, 2 Mar 2008 15:26:23 +0000 (10:26 -0500)]
[PATCH] switch ide-cd

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch viocd
Al Viro [Sun, 2 Mar 2008 15:25:44 +0000 (10:25 -0500)]
[PATCH] switch viocd

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch gdrom
Al Viro [Sun, 2 Mar 2008 15:25:18 +0000 (10:25 -0500)]
[PATCH] switch gdrom

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch z2ram
Al Viro [Sun, 2 Mar 2008 15:24:45 +0000 (10:24 -0500)]
[PATCH] switch z2ram

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch xyspace
Al Viro [Sun, 2 Mar 2008 15:24:18 +0000 (10:24 -0500)]
[PATCH] switch xyspace

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch xen
Al Viro [Sun, 2 Mar 2008 15:23:47 +0000 (10:23 -0500)]
[PATCH] switch xen

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch xd
Al Viro [Sun, 2 Mar 2008 15:23:12 +0000 (10:23 -0500)]
[PATCH] switch xd

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch virtio_blk
Al Viro [Sun, 2 Mar 2008 15:22:33 +0000 (10:22 -0500)]
[PATCH] switch virtio_blk

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch viodasd
Al Viro [Sun, 2 Mar 2008 15:22:07 +0000 (10:22 -0500)]
[PATCH] switch viodasd

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch ub
Al Viro [Sun, 2 Mar 2008 15:21:43 +0000 (10:21 -0500)]
[PATCH] switch ub

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch swim3
Al Viro [Sun, 2 Mar 2008 15:20:44 +0000 (10:20 -0500)]
[PATCH] switch swim3

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch pktdvdcd
Al Viro [Sun, 2 Mar 2008 15:15:10 +0000 (10:15 -0500)]
[PATCH] switch pktdvdcd

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch pf
Al Viro [Sun, 2 Mar 2008 14:36:16 +0000 (09:36 -0500)]
[PATCH] switch pf

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch pd
Al Viro [Sun, 2 Mar 2008 14:35:54 +0000 (09:35 -0500)]
[PATCH] switch pd

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch pcd
Al Viro [Sun, 2 Mar 2008 14:35:06 +0000 (09:35 -0500)]
[PATCH] switch pcd

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch nbd
Al Viro [Sun, 2 Mar 2008 14:33:33 +0000 (09:33 -0500)]
[PATCH] switch nbd

NB: nbd_ioctl() appears to be racy; BKL is held, but doesn't really
help, AFAICS.  Left as-is for now, but it'll need fixing.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch loop
Al Viro [Sun, 2 Mar 2008 14:29:48 +0000 (09:29 -0500)]
[PATCH] switch loop

ioctl doesn't need BKL here

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch floppy
Al Viro [Sun, 2 Mar 2008 14:27:55 +0000 (09:27 -0500)]
[PATCH] switch floppy

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch cpqarray
Al Viro [Sun, 2 Mar 2008 14:27:11 +0000 (09:27 -0500)]
[PATCH] switch cpqarray

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch cciss
Al Viro [Sun, 2 Mar 2008 14:26:41 +0000 (09:26 -0500)]
[PATCH] switch cciss

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch brd
Al Viro [Sun, 2 Mar 2008 14:24:35 +0000 (09:24 -0500)]
[PATCH] switch brd

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch ataflop
Al Viro [Sun, 2 Mar 2008 14:23:54 +0000 (09:23 -0500)]
[PATCH] switch ataflop

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch aoeblk
Al Viro [Sun, 2 Mar 2008 14:23:18 +0000 (09:23 -0500)]
[PATCH] switch aoeblk

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch amiflop
Al Viro [Sun, 2 Mar 2008 14:22:38 +0000 (09:22 -0500)]
[PATCH] switch amiflop

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch DAC960
Al Viro [Sun, 2 Mar 2008 14:18:16 +0000 (09:18 -0500)]
[PATCH] switch DAC960

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch ubd
Al Viro [Sun, 2 Mar 2008 14:16:26 +0000 (09:16 -0500)]
[PATCH] switch ubd

ubd_ioctl() doesn't need BKL, so unlocked_ioctl() it becomes...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] beginning of methods conversion
Al Viro [Sun, 2 Mar 2008 14:09:22 +0000 (09:09 -0500)]
[PATCH] beginning of methods conversion

To keep the size of changesets sane we split the switch by drivers;
to keep the damn thing bisectable we do the following:
1) rename the affected methods, add ones with correct
prototypes, make (few) callers handle both.  That's this changeset.
2) for each driver convert to new methods.  *ALL* drivers
are converted in this series.
3) kill the old (renamed) methods.

Note that it _is_ a flagday; all in-tree drivers are converted and by the
end of this series no trace of old methods remain.  The only reason why
we do that this way is to keep the damn thing bisectable and allow per-driver
debugging if anything goes wrong.

New methods:
open(bdev, mode)
release(disk, mode)
ioctl(bdev, mode, cmd, arg) /* Called without BKL */
compat_ioctl(bdev, mode, cmd, arg)
locked_ioctl(bdev, mode, cmd, arg) /* Called with BKL, legacy */

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch ide_disk_ops ->ioctl() to sane prototype
Al Viro [Thu, 16 Oct 2008 14:23:20 +0000 (10:23 -0400)]
[PATCH] switch ide_disk_ops ->ioctl() to sane prototype

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] don't mess with file in scsi_nonblockable_ioctl()
Al Viro [Sun, 2 Mar 2008 13:15:49 +0000 (08:15 -0500)]
[PATCH] don't mess with file in scsi_nonblockable_ioctl()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] introduce __blkdev_driver_ioctl()
Al Viro [Thu, 30 Aug 2007 00:34:12 +0000 (20:34 -0400)]
[PATCH] introduce __blkdev_driver_ioctl()

Analog of blkdev_driver_ioctl() with sane arguments.  For
now uses fake struct file, by the end of the series it won't
and blkdev_driver_ioctl() will become a wrapper around it.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch pktcdvd to blkdev_driver_ioctl()
Al Viro [Wed, 29 Aug 2007 04:56:32 +0000 (00:56 -0400)]
[PATCH] switch pktcdvd to blkdev_driver_ioctl()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch cdrom_{open,release,ioctl} to sane APIs
Al Viro [Sun, 7 Oct 2007 21:54:28 +0000 (17:54 -0400)]
[PATCH] switch cdrom_{open,release,ioctl} to sane APIs

... convert to it in callers

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] move block_device_operations to blkdev.h
Al Viro [Mon, 8 Oct 2007 17:26:20 +0000 (13:26 -0400)]
[PATCH] move block_device_operations to blkdev.h

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] lose unused arguments in dm ioctl callbacks
Al Viro [Wed, 29 Aug 2007 02:15:59 +0000 (22:15 -0400)]
[PATCH] lose unused arguments in dm ioctl callbacks

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] lose the unused file argument in generic_ide_ioctl()
Al Viro [Tue, 2 Sep 2008 21:19:43 +0000 (17:19 -0400)]
[PATCH] lose the unused file argument in generic_ide_ioctl()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch scsi_cmd_ioctl() to passing fmode_t
Al Viro [Mon, 27 Aug 2007 19:38:10 +0000 (15:38 -0400)]
[PATCH] switch scsi_cmd_ioctl() to passing fmode_t

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] switch sg_scsi_ioctl() to passing fmode_t
Al Viro [Tue, 2 Sep 2008 21:16:41 +0000 (17:16 -0400)]
[PATCH] switch sg_scsi_ioctl() to passing fmode_t

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] pass mode instead of file to sg_io()
Al Viro [Tue, 2 Sep 2008 20:35:55 +0000 (16:35 -0400)]
[PATCH] pass mode instead of file to sg_io()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] eliminate use of ->f_flags in block methods
Al Viro [Sun, 26 Aug 2007 23:50:05 +0000 (19:50 -0400)]
[PATCH] eliminate use of ->f_flags in block methods

store needed information in f_mode

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years ago[PATCH] introduce fmode_t, do annotations
Al Viro [Tue, 2 Sep 2008 19:28:45 +0000 (15:28 -0400)]
[PATCH] introduce fmode_t, do annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
10 years agobinfmt_elf_fdpic: Update for cputime changes.
Paul Mundt [Tue, 21 Oct 2008 03:07:40 +0000 (12:07 +0900)]
binfmt_elf_fdpic: Update for cputime changes.

Commit f06febc96ba8e0af80bcc3eaec0a109e88275fac ("timers: fix itimer/
many thread hang") introduced a new task_cputime interface and
subsequently only converted binfmt_elf over to it.  This results in the
build for binfmt_elf_fdpic blowing up given that p->signal->{u,s}time
have disappeared from underneath us.

Apply the same trivial fix from binfmt_elf to binfmt_elf_fdpic.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agomm: remove duplicated #include's
Huang Weiyi [Mon, 20 Oct 2008 22:43:33 +0000 (06:43 +0800)]
mm: remove duplicated #include's

Removed duplicated #include <linux/vmalloc.h> in mm/vmalloc.c and
"internal.h" in mm/memory.c.

Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agoExport tiny shmem_file_setup for DRM-GEM
Hugh Dickins [Mon, 20 Oct 2008 23:04:04 +0000 (00:04 +0100)]
Export tiny shmem_file_setup for DRM-GEM

We're trying to keep the !CONFIG_SHMEM tiny-shmem.c (using ramfs without
swap) in synch with CONFIG_SHMEM shmem.c (and mpm is preparing patches
to combine them).  I was glad to see EXPORT_SYMBOL_GPL(shmem_file_setup)
go into shmem.c, but why not support DRM-GEM when !CONFIG_SHMEM too?
But caution says still depend on MMU, since !CONFIG_MMU is.. different.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Acked-by: Matt Mackall <mpm@selenic.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agomisc: replace remaining __FUNCTION__ with __func__
Harvey Harrison [Mon, 20 Oct 2008 23:00:08 +0000 (16:00 -0700)]
misc: replace remaining __FUNCTION__ with __func__

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agofix CONFIG_HIGHMEM compile error in drivers/gpu/drm/i915/i915_gem.c
Thomas Gleixner [Mon, 20 Oct 2008 22:47:45 +0000 (00:47 +0200)]
fix CONFIG_HIGHMEM compile error in drivers/gpu/drm/i915/i915_gem.c

commit 9b7530cc329eb036cfa589930c270e85031f554c ("i915: cleanup coding
horrors in i915_gem_gtt_pwrite()")

broke the i386 build for CONFIG_HIGHMEM=y.

Caught by automatic testing http://www.tglx.de/autoqa-logs/000137-0006-0001.log

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
[ My bad. It's the same patch I sent out earlier, nobody noticed then either.. ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agofix WARN() for PPC
Arjan van de Ven [Mon, 20 Oct 2008 21:41:03 +0000 (14:41 -0700)]
fix WARN() for PPC

powerpc doesn't use the generic WARN_ON infrastructure.  The newly
introduced WARN() as a result didn't print the message, this patch adds
the printk for this specific case.

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agokexec: fix crash_save_vmcoreinfo_init build problem
Luck, Tony [Mon, 20 Oct 2008 22:23:40 +0000 (15:23 -0700)]
kexec: fix crash_save_vmcoreinfo_init build problem

This fixes

  kernel/kexec.c: In function 'crash_save_vmcoreinfo_init':
  kernel/kexec.c:1374: error: 'vmlist' undeclared (first use in this function)
  kernel/kexec.c:1374: error: (Each undeclared identifier is reported only once
  kernel/kexec.c:1374: error: for each function it appears in.)
  kernel/kexec.c:1410: error: invalid use of undefined type 'struct vm_struct'
  make[1]: *** [kernel/kexec.o] Error 1

Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
Linus Torvalds [Mon, 20 Oct 2008 21:38:14 +0000 (14:38 -0700)]
Merge git://git./linux/kernel/git/kyle/parisc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  parisc: convert to generic compat_sys_ptrace
  parisc: add rtc platform driver
  parisc: initialize unwinder much earlier
  parisc: add new syscalls
  parisc: hijack jump to start_kernel
  parisc: add pdc_coproc_cfg_unlocked and set_firmware_width_unlocked
  parisc: move include/asm-parisc to arch/parisc/include/asm
  parisc: move pdc_result to real2.S
  parisc: unify CCIO_COLLECT_STATS implementation
  parisc: add arch/parisc/kernel/.gitignore
  parisc: ropes.h - fix <asm-parisc/*> -> <asm/*>
  parisc: parisc-agp - fix <asm-parisc/*> -> <asm/*>

Resolve remove/rename conflict: include/asm-parisc/a.out.h is no longer
relevant.

10 years agoUSB: Fix unused label warnings in drivers/usb/host/ehci-hcd.c
Linus Torvalds [Mon, 20 Oct 2008 21:23:29 +0000 (14:23 -0700)]
USB: Fix unused label warnings in drivers/usb/host/ehci-hcd.c

This gets rid of an annoying warning in ehci-hcd.c when DEBUG isn't
enabled:

    warning: label 'err_debug' defined but not used

by moving it inside the already-existing #ifdef DEBUG, so that it
matches the goto.  And now my regular build is warning-free again.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agoi915: cleanup coding horrors in i915_gem_gtt_pwrite()
Linus Torvalds [Mon, 20 Oct 2008 21:16:43 +0000 (14:16 -0700)]
i915: cleanup coding horrors in i915_gem_gtt_pwrite()

Yes, this will probably be switched over to a cleaner model anyway, but
in the meantime I don't want to see the 'unused variable' warnings that
come from the disgusting #ifdef code.  Make the special case be a nice
inlien function of its own, clean up the code, and make the warning go
away.

I wish people didn't write code that gets (valid) warnings from the
compiler, but I'll limit my fixes to code that I actually care about (in
this case just because I see the warning and it annoys me).

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agoFix sprintf format warnings in drm_proc.c
Linus Torvalds [Mon, 20 Oct 2008 21:14:25 +0000 (14:14 -0700)]
Fix sprintf format warnings in drm_proc.c

Use "%zd" for size_t, and make sure to have a space between the numbers
instead of depending on the field width.

I don't like warnings in my default targeted build.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agoMerge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
Linus Torvalds [Mon, 20 Oct 2008 20:42:14 +0000 (13:42 -0700)]
Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

* 'bkl-removal' of git://git.lwn.net/linux-2.6:
  UIO: BKL removal

10 years agoMerge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
Linus Torvalds [Mon, 20 Oct 2008 20:40:47 +0000 (13:40 -0700)]
Merge branch 'linux-next' of git://git./linux/kernel/git/jbarnes/pci-2.6

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (41 commits)
  PCI: fix pci_ioremap_bar() on s390
  PCI: fix AER capability check
  PCI: use pci_find_ext_capability everywhere
  PCI: remove #ifdef DEBUG around dev_dbg call
  PCI hotplug: fix get_##name return value problem
  PCI: document the pcie_aspm kernel parameter
  PCI: introduce an pci_ioremap(pdev, barnr) function
  powerpc/PCI: Add legacy PCI access via sysfs
  PCI: Add ability to mmap legacy_io on some platforms
  PCI: probing debug message uniformization
  PCI: support PCIe ARI capability
  PCI: centralize the capabilities code in probe.c
  PCI: centralize the capabilities code in pci-sysfs.c
  PCI: fix 64-vbit prefetchable memory resource BARs
  PCI: replace cfg space size (256/4096) by macros.
  PCI: use resource_size() everywhere.
  PCI: use same arg names in PCI_VDEVICE comment
  PCI hotplug: rpaphp: make debug var unique
  PCI: use %pF instead of print_fn_descriptor_symbol() in quirks.c
  PCI: fix hotplug get_##name return value problem
  ...

10 years agoMerge branch 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Mon, 20 Oct 2008 20:35:07 +0000 (13:35 -0700)]
Merge branch 'tracing-v28-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (131 commits)
  tracing/fastboot: improve help text
  tracing/stacktrace: improve help text
  tracing/fastboot: fix initcalls disposition in bootgraph.pl
  tracing/fastboot: fix bootgraph.pl initcall name regexp
  tracing/fastboot: fix issues and improve output of bootgraph.pl
  tracepoints: synchronize unregister static inline
  tracepoints: tracepoint_synchronize_unregister()
  ftrace: make ftrace_test_p6nop disassembler-friendly
  markers: fix synchronize marker unregister static inline
  tracing/fastboot: add better resolution to initcall debug/tracing
  trace: add build-time check to avoid overrunning hex buffer
  ftrace: fix hex output mode of ftrace
  tracing/fastboot: fix initcalls disposition in bootgraph.pl
  tracing/fastboot: fix printk format typo in boot tracer
  ftrace: return an error when setting a nonexistent tracer
  ftrace: make some tracers reentrant
  ring-buffer: make reentrant
  ring-buffer: move page indexes into page headers
  tracing/fastboot: only trace non-module initcalls
  ftrace: move pc counter in irqtrace
  ...

Manually fix conflicts:
 - init/main.c: initcall tracing
 - kernel/module.c: verbose level vs tracepoints
 - scripts/bootgraph.pl: fallout from cherry-picking commits.

10 years agoMerge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Mon, 20 Oct 2008 20:27:05 +0000 (13:27 -0700)]
Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86 ACPI: fix breakage of resume on 64-bit UP systems with SMP kernel
  Introduce is_vmalloc_or_module_addr() and use with DEBUG_VIRTUAL

10 years agoMerge branch 'genirq-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Mon, 20 Oct 2008 20:22:50 +0000 (13:22 -0700)]
Merge branch 'genirq-v28-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

This merges branches irq/genirq, irq/sparseirq-v4, timers/hpet-percpu
and x86/uv.

The sparseirq branch is just preliminary groundwork: no sparse IRQs are
actually implemented by this tree anymore - just the new APIs are added
while keeping the old way intact as well (the new APIs map 1:1 to
irq_desc[]).  The 'real' sparse IRQ support will then be a relatively
small patch ontop of this - with a v2.6.29 merge target.

* 'genirq-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (178 commits)
  genirq: improve include files
  intr_remapping: fix typo
  io_apic: make irq_mis_count available on 64-bit too
  genirq: fix name space collisions of nr_irqs in arch/*
  genirq: fix name space collision of nr_irqs in autoprobe.c
  genirq: use iterators for irq_desc loops
  proc: fixup irq iterator
  genirq: add reverse iterator for irq_desc
  x86: move ack_bad_irq() to irq.c
  x86: unify show_interrupts() and proc helpers
  x86: cleanup show_interrupts
  genirq: cleanup the sparseirq modifications
  genirq: remove artifacts from sparseirq removal
  genirq: revert dynarray
  genirq: remove irq_to_desc_alloc
  genirq: remove sparse irq code
  genirq: use inline function for irq_to_desc
  genirq: consolidate nr_irqs and for_each_irq_desc()
  x86: remove sparse irq from Kconfig
  genirq: define nr_irqs for architectures with GENERIC_HARDIRQS=n
  ...

10 years agoMerge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Mon, 20 Oct 2008 20:21:24 +0000 (13:21 -0700)]
Merge branch 'core-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  m32r: fix build due to notify_cpu_starting() change
  powerpc: fix linux-next build failure

10 years agoMerge branch 'v28-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Mon, 20 Oct 2008 20:19:56 +0000 (13:19 -0700)]
Merge branch 'v28-timers-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'v28-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (36 commits)
  fix documentation of sysrq-q really
  Fix documentation of sysrq-q
  timer_list: add base address to clock base
  timer_list: print cpu number of clockevents device
  timer_list: print real timer address
  NOHZ: restart tick device from irq_enter()
  NOHZ: split tick_nohz_restart_sched_tick()
  NOHZ: unify the nohz function calls in irq_enter()
  timers: fix itimer/many thread hang, fix
  timers: fix itimer/many thread hang, v3
  ntp: improve adjtimex frequency rounding
  timekeeping: fix rounding problem during clock update
  ntp: let update_persistent_clock() sleep
  hrtimer: reorder struct hrtimer to save 8 bytes on 64bit builds
  posix-timers: lock_timer: make it readable
  posix-timers: lock_timer: kill the bogus ->it_id check
  posix-timers: kill ->it_sigev_signo and ->it_sigev_value
  posix-timers: sys_timer_create: cleanup the error handling
  posix-timers: move the initialization of timer->sigq from send to create path
  posix-timers: sys_timer_create: simplify and s/tasklist/rcu/
  ...

Fix trivial conflicts due to sysrq-q description clahes in
Documentation/sysrq.txt and drivers/char/sysrq.c

10 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
Linus Torvalds [Mon, 20 Oct 2008 20:12:39 +0000 (13:12 -0700)]
Merge git://git./linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (36 commits)
  ide: re-add TRM290 fix lost during ide_build_dmatable() cleanup
  scc_pata: kill unused variables
  sgiioc4: kill duplicate ioremap()
  sgiioc4: kill useless address checks
  delkin_cb: add PM support
  ide: remove broken hpt34x driver
  ide-floppy: remove idefloppy_floppy_t typedef
  sgiioc4: remove maskproc() method
  hpt366: cleanup maskproc() method
  ide: mask interrupt in ide_config_drive_speed()
  hpt366: fix compile warning
  ide: remove unused macros from <asm-parisc/ide.h>
  ide: remove M68K_IDE_SWAPW define from <asm-m68k/ide.h>
  ide: remove dead <asm-arm/arch-sa1100/ide.h>
  ide: fix support for IDE PCI controllers using MMIO on frv
  ide-cd: remove stale comment
  ide-cd: small drive type print fix
  ide-cd: debug log enhancements
  ide: add generic ATA/ATAPI disk driver
  ide: allow device drivers to specify per-device type /proc settings
  ...

10 years agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
Linus Torvalds [Mon, 20 Oct 2008 19:54:30 +0000 (12:54 -0700)]
Merge branch 'next' of git://git./linux/kernel/git/djbw/async_tx

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
  fsldma: allow Freescale Elo DMA driver to be compiled as a module
  fsldma: remove internal self-test from Freescale Elo DMA driver
  drivers/dma/dmatest.c: switch a GFP_ATOMIC to GFP_KERNEL
  dmatest: properly handle duplicate DMA channels
  drivers/dma/ioat_dma.c: drop code after return
  async_tx: make async_tx_run_dependencies() easier to read

10 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
Linus Torvalds [Mon, 20 Oct 2008 19:53:40 +0000 (12:53 -0700)]
Merge git://git./linux/kernel/git/wim/linux-2.6-watchdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] ib700wdt.c - fix buffer_underflow bug

10 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
Linus Torvalds [Mon, 20 Oct 2008 19:53:27 +0000 (12:53 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/mszeredi/fuse

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: implement nonseekable open
  fuse: add include protectors
  fuse: config description improvement
  fuse: add missing fuse_request_free
  fuse: fix SEEK_END incorrectness

10 years agobyteorder: remove direct includes of linux/byteorder/swab[b].h
Harvey Harrison [Mon, 20 Oct 2008 17:23:38 +0000 (10:23 -0700)]
byteorder: remove direct includes of linux/byteorder/swab[b].h

A consolidated implementation will provide this generically through
asm/byteorder, remove direct includes to avoid breakage when the
changeover to the new implementation occurs.

This hunk was lost from commit 1d8cca44b6a244b7e378546d719041819049a0f9
("byteorder: provide swabb.h generically in asm/byteorder.h")

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agoUpdate email addresses.
Dave Jones [Mon, 20 Oct 2008 17:31:45 +0000 (13:31 -0400)]
Update email addresses.

Update assorted email addresses and related info to point
to a single current, valid address.

additionally
- trivial CREDITS entry updates. (Not that this file means much any more)
- remove arjans dead redhat.com address from powernow driver

Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agofs/Kconfig: move ext2, ext3, ext4, JBD, JBD2 out
Alexey Dobriyan [Mon, 20 Oct 2008 18:28:45 +0000 (22:28 +0400)]
fs/Kconfig: move ext2, ext3, ext4, JBD, JBD2 out

Use fs/*/Kconfig more, which is good because everything related to one
filesystem is in one place and fs/Kconfig is quite fat.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agoRemove empty imacfb.c file
Linus Torvalds [Mon, 20 Oct 2008 18:32:09 +0000 (11:32 -0700)]
Remove empty imacfb.c file

Commit 7c08c9ae0c145807c0dae4a55f240fa3d4fd5262 ("efifb/imacfb
consolidation + hardware support") claimed to remove imacfb entirely and
merge its DMI table into the efifb driver.  So far so good, but the diff
actually ended up just generating an empty file instead of removing it.

[ Technical reason: the patch header looked like

  diff -puN drivers/video/imacfb.c~efifb-imacfb-consolidation-hardware-support drivers/video/imacfb.c
  --- a/drivers/video/imacfb.c~efifb-imacfb-consolidation-hardware-support
  +++ a/drivers/video/imacfb.c
  @@ -1,376 +0,0 @@

  which git will think is a truncation, not a delete.  Git wants to see a
  target of /dev/null to consider it a delete. ]

So remove it properly.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agoPCI: fix pci_ioremap_bar() on s390
Heiko Carstens [Mon, 20 Oct 2008 17:45:43 +0000 (19:45 +0200)]
PCI: fix pci_ioremap_bar() on s390

s390 doesn't have ioremap_*, so protect the definition of the new
pci_ioremap_bar function with CONFIG_HAS_IOMEM to avoid build breakage.

Acked-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
10 years agoUpdate .gitignore files for generated targets
Linus Torvalds [Mon, 20 Oct 2008 18:24:31 +0000 (11:24 -0700)]
Update .gitignore files for generated targets

The generated 'capflags.c' file wasn't properly ignored, and the list of
files in scripts/basic/ wasn't up-to-date.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agoPCI: fix AER capability check
Yu Zhao [Sun, 19 Oct 2008 12:35:20 +0000 (20:35 +0800)]
PCI: fix AER capability check

The 'use pci_find_ext_capability everywhere' cleanup brought a new bug,
which makes the AER stop working.  Fix it by actually using find_ext_cap
instead of just find_cap.  Drop the unused config space size define while
we're at it.

Signed-off-by: Yu Zhao <yu.zhao@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
10 years agoPCI: use pci_find_ext_capability everywhere
Jesse Barnes [Sun, 19 Oct 2008 00:33:19 +0000 (17:33 -0700)]
PCI: use pci_find_ext_capability everywhere

Remove some open coded (and buggy) versions of pci_find_ext_capability
in favor of the real routine in the PCI core.

Tested-by: Tomasz Czernecki <czernecki@gmail.com>
Acked-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Reviewed-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
10 years agoPCI: remove #ifdef DEBUG around dev_dbg call
Jesse Barnes [Sun, 19 Oct 2008 00:19:38 +0000 (17:19 -0700)]
PCI: remove #ifdef DEBUG around dev_dbg call

No longer needed since we don't use the function symbol stuff anymore.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
10 years agoPCI hotplug: fix get_##name return value problem
Kenji Kaneshige [Mon, 29 Sep 2008 08:37:05 +0000 (17:37 +0900)]
PCI hotplug: fix get_##name return value problem

The commit 356a9d6f3dd283f83861adf1ac909879f0e66411 (PCI: fix hotplug
get_##name return value problem) doesn't seem to be merged properly.
Because of this, PCI hotplug no longer works (Read/Write PCI hotplug
files always returns -ENODEV).

This patch fixes wrong check of try_module_get() return value check in
get_##name().

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
10 years agoPCI: document the pcie_aspm kernel parameter
Chuck Ebbert [Thu, 25 Sep 2008 00:40:34 +0000 (20:40 -0400)]
PCI: document the pcie_aspm kernel parameter

It can be handy so make sure people know about it.

Signed-off-by: Chuck Ebbert <cebbert@redhat.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
10 years agoPCI: introduce an pci_ioremap(pdev, barnr) function
Arjan van de Ven [Sun, 28 Sep 2008 23:36:11 +0000 (16:36 -0700)]
PCI: introduce an pci_ioremap(pdev, barnr) function

A common thing in many PCI drivers is to ioremap() an entire bar.  This
is a slightly fragile thing right now, needing both an address and a
size, and many driver writers do.. various things there.

This patch introduces an pci_ioremap() function taking just a PCI device
struct and the bar number as arguments, and figures this all out itself,
in one place.  In addition, we can add various sanity checks to this
function (the patch already checks to make sure that the bar in question
really is a MEM bar; few to no drivers do that sort of thing).

Hopefully with this type of API we get less chance of mistakes in
drivers with ioremap() operations.

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
10 years agopowerpc/PCI: Add legacy PCI access via sysfs
Benjamin Herrenschmidt [Tue, 14 Oct 2008 00:55:31 +0000 (11:55 +1100)]
powerpc/PCI: Add legacy PCI access via sysfs

This patch adds support for legacy_io and legacy_mem files in
bus class directories in sysfs for powerpc

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
10 years agoPCI: Add ability to mmap legacy_io on some platforms
Benjamin Herrenschmidt [Fri, 3 Oct 2008 09:49:32 +0000 (19:49 +1000)]
PCI: Add ability to mmap legacy_io on some platforms

This adds the ability to mmap legacy IO space to the legacy_io files
in sysfs on platforms that support it. This will allow to clean up
X to use this instead of /dev/mem for legacy IO accesses such as
those performed by Int10.

While at it I moved pci_create/remove_legacy_files() to pci-sysfs.c
where I think they belong, thus making more things statis in there
and cleaned up some spurrious prototypes in the ia64 pci.h file

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>