Commit Graph
3766 Commits
Author SHA1 Message Date
Dmitry Torokhov 7b7e394185 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-04-29 01:11:23 -04:00
David Woodhouse c3ce7e203a Sanitise ethtool.h and mii.h for userspace.
They shouldn't be using 'u32' et al in structures which are used for
communication with userspace. Switch to the proper types (__u32 etc).

Signed-off-by: David Woodhouse <[email protected]>
2006-04-29 01:53:47 +01:00
David Woodhouse 34c278d391 Remove 'extern int errno;' from public view in linux/unistd.h
Signed-off-by: David Woodhouse <[email protected]>
2006-04-29 01:49:06 +01:00
David Woodhouse c7afb48eb5 Remove struct input_device_id from public view in linux/input.h
It uses kernel_ulong_t but can't be wrapped in __KERNEL__ because it's
used from scripts/mod/file2alias.c -- but we _can_ hide it inside
header manually too (and it doesn't generally exist for userspace).

Signed-off-by: David Woodhouse <[email protected]>
2006-04-29 01:48:16 +01:00
David Woodhouse 778382e08c Don't include <linux/mod_devicetable.h> in public part of linux/pci.h
Signed-off-by: David Woodhouse <[email protected]>
2006-04-29 01:46:02 +01:00
David Woodhouse d6754b401a Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-04-29 01:42:26 +01:00
Andrew Morton 13e87ec686 [PATCH] request_irq(): remove warnings from irq probing
- Add new SA_PROBEIRQ which suppresses the new sharing-mismatch warning.
  Some drivers like to use request_irq() to find an unused interrupt slot.

- Use it in i82365.c

- Kill unused SA_PROBE.

Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
2006-04-28 08:33:46 -07:00
Linus Torvalds 2cb14596a0 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  [PATCH] Added URI of "linux kernel development process"
  [PATCH] Kobject: possible cleanups
  [PATCH] Fix OCFS2 warning when DEBUG_FS is not enabled
  [PATCH] Kobject: fix build error
  [PATCH] Frame buffer: remove cmap sysfs interface
2006-04-27 14:25:30 -07:00
Adrian Bunk 5b3ef14e3e [PATCH] Kobject: possible cleanups
This patch contains the following possible cleanups:
- #if 0 the following unused global function:
  - subsys_remove_file()
- remove the following unused EXPORT_SYMBOL's:
  - kset_find_obj
  - subsystem_init
- remove the following unused EXPORT_SYMBOL_GPL:
  - kobject_add_dir

Signed-off-by: Adrian Bunk <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2006-04-27 13:08:56 -07:00
Jean Delvare bde11d7942 [PATCH] Fix OCFS2 warning when DEBUG_FS is not enabled
Fix the following warning which happens when OCFS2_FS is enabled but
DEBUG_FS isn't:

fs/ocfs2/dlmglue.c: In function `ocfs2_dlm_init_debug':
fs/ocfs2/dlmglue.c:2036: warning: passing arg 5 of `debugfs_create_file' discards qualifiers from pointer target type

Signed-off-by: Jean Delvare <[email protected]>
Cc: Arjan van de Ven <[email protected]>
Cc: Joel Becker <[email protected]>
Acked-by: Mark Fasheh <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2006-04-27 13:08:56 -07:00
Kay Sievers 4d17ffda33 [PATCH] Kobject: fix build error
This fixes a build error for various odd combinations of CONFIG_HOTPLUG
and CONFIG_NET.

Signed-off-by: Kay Sievers <[email protected]>
Cc: Nigel Cunningham <[email protected]>
Cc: Andrew Morton <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2006-04-27 13:08:56 -07:00
David Woodhouse acc429a517 linux/blkpg.h needs <linux/compiler.h> for __user
Signed-off-by: David Woodhouse <[email protected]>
2006-04-27 16:46:56 +01:00
Jeff Garzik 7894eaf291 Merge branch 'upstream' into irq-pio 2006-04-27 04:55:53 -04:00
Jeff Garzik 9a375e93f8 Merge branch 'upstream' into max-sect 2006-04-27 04:55:26 -04:00
Jeff Garzik acc696d93d Merge branch 'master' into upstream 2006-04-27 04:53:34 -04:00
Jeff Garzik 1a2e8a6f8e Merge branch 'master' into upstream 2006-04-27 04:52:44 -04:00
Jens Axboe ebf43500ef [PATCH] Add find_get_pages_contig(): contiguous variant of find_get_pages()
find_get_pages_contig() will break out if we hit a hole in the page cache.
From Andrew Morton, small modifications and documentation by me.

Signed-off-by: Jens Axboe <[email protected]>
2006-04-27 08:59:48 +02:00
David Woodhouse b7b3c76a0a Sanitise linux/sched.h for userspace consumption
There was a whole load of crap exposed which should have been inside the
existing #ifdef __KERNEL__ part. Also hide struct sched_param for now,
since glibc has its own and doesn't like being given ours (yet).

Signed-off-by: David Woodhouse <[email protected]>
2006-04-27 00:12:56 +01:00
David Woodhouse f001e47f83 Sanitise linux/audit.h for userspace consumption, split elf-em.h from elf.h
Don't include <linux/sched.h> outside __KERNEL__, and split the EM_xxx
definitions out of elf.h into elf-em.h so that audit.h can include just
that and not pollute the namespace any further than it needs to.

Signed-off-by: David Woodhouse <[email protected]>
2006-04-27 00:11:01 +01:00
Linus Torvalds 7b97ebfb93 Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [PATCH] splice: add ->splice_write support for /dev/null
  [PATCH] splice: rearrange moving to/from pipe helpers
  [PATCH] Add support for the sys_vmsplice syscall
  [PATCH] splice: fix offset problems
  [PATCH] splice: fix min() warning
2006-04-26 07:47:55 -07:00
Jens Axboe 00522fb41a [PATCH] splice: rearrange moving to/from pipe helpers
We need these for people writing their own ->splice_read/write hooks.

Signed-off-by: Jens Axboe <[email protected]>
2006-04-26 14:39:29 +02:00
David Woodhouse 62c4f0a2d5 Don't include linux/config.h from anywhere else in include/
Signed-off-by: David Woodhouse <[email protected]>
2006-04-26 12:56:16 +01:00
Jeff Garzik 9f1da23b63 Merge branch 'upstream-fixes' into upstream 2006-04-26 06:21:31 -04:00
Stephen Hemminger 734cbc363b [PATCH] sky2: reschedule if irq still pending
This is a workaround for the case edge-triggered irq's. Several users
seem to have broken configurations sharing edge-triggered irq's. To avoid
losing IRQ's, reshedule if more work arrives.

The changes to netdevice.h are to extract the part that puts device
back in list into separate inline.

Signed-off-by: Stephen Hemminger <[email protected]>
Signed-off-by: Jeff Garzik <[email protected]>
2006-04-26 06:19:45 -04:00
Jeff Garzik 45de6fd958 Merge branch 'upstream-fixes' into upstream 2006-04-26 06:18:00 -04:00
Jens Axboe 912d35f867 [PATCH] Add support for the sys_vmsplice syscall
sys_splice() moves data to/from pipes with a file input/output. sys_vmsplice()
moves data to a pipe, with the input being a user address range instead.

This uses an approach suggested by Linus, where we can hold partial ranges
inside the pages[] map. Hopefully this will be useful for network
receive support as well.

Signed-off-by: Jens Axboe <[email protected]>
2006-04-26 10:59:21 +02:00
Dmitry Torokhov ddc5d34145 Input: move input_device_id to mod_devicetable.h
Signed-off-by: Dmitry Torokhov <[email protected]>
2006-04-26 00:14:19 -04:00
Dmitry Torokhov 1a0ccece05 Input: allow passing NULL to input_free_device()
Many drivers rely on input_free_device() behaving like kfree().

Signed-off-by: Dmitry Torokhov <[email protected]>
2006-04-26 00:13:57 -04:00
Imre Deak d5b415c95f Input: ads7846 - improve filtering for thumb press accuracy
Providing more accurate coordinates for thumb press requires additional
steps in the filtering logic:

- Ignore samples found invalid by the debouncing logic, or the ones that
  have out of bound pressure value.
- Add a parameter to repeat debouncing, so that more then two consecutive
  good readings are required for a valid sample.

Signed-off-by: Imre Deak <[email protected]>
Acked-by: Juha Yrjola <[email protected]>
Signed-off-by: Dmitry Torokhov <[email protected]>
2006-04-26 00:13:18 -04:00
David Woodhouse 089f26d5e3 Don't include <linux/config.h> and <linux/linkage.h> from linux/socket.h
Signed-off-by: David Woodhouse <[email protected]>
2006-04-25 15:29:01 +01:00
David Woodhouse d85004eb15 Don't include private headers from user-visible part of linux/ext3_fs.h
Signed-off-by: David Woodhouse <[email protected]>
2006-04-25 15:18:46 +01:00
David Woodhouse 52a78c1cae Don't include private headers from user-visible part of linux/ext2_fs.h
Signed-off-by: David Woodhouse <[email protected]>
2006-04-25 15:18:31 +01:00
David Woodhouse 19b3bd667b Don't include private headers from user-visible part of linux/smb_fs.h
Signed-off-by: David Woodhouse <[email protected]>
2006-04-25 15:18:05 +01:00
David Woodhouse 1af042271f Sanitise linux/sunrpc/debug.h for userspace consumption
Move some inclusion of private header files and the definition of
RPC_DEBUG inside the existing #ifdef __KERNEL__

Signed-off-by: David Woodhouse <[email protected]>
2006-04-25 15:16:44 +01:00
David Woodhouse eae19a762d Don't export CONFIG_COMPAT stuff in linux/usbdevice_fs.h to userspace
Signed-off-by: David Woodhouse <[email protected]>
2006-04-25 15:14:50 +01:00
David Woodhouse 468db83658 Don't include <linux/spinlock.h> from user-visible part of linux/wanrouter.h
Signed-off-by: David Woodhouse <[email protected]>
2006-04-25 15:00:56 +01:00
David Woodhouse 7ab2febd4d Don't include private headers from user-visible part of linux/signal.h
Signed-off-by: David Woodhouse <[email protected]>
2006-04-25 14:55:46 +01:00
David Woodhouse 8ffbc759a5 Don't include <asm/atomic.h> from user-visible part of linux/sem.h
Signed-off-by: David Woodhouse <[email protected]>
2006-04-25 14:55:13 +01:00
David Woodhouse a3b6714e17 Partially sanitise linux/sched.h for userspace consumption
For now, just make sure all inclusion of private header files is done
within #ifdef __KERNEL__. There'll be more to clean up later.

Signed-off-by: David Woodhouse <[email protected]>
2006-04-25 14:54:40 +01:00
David Woodhouse 98ca79d52b Don't include <linux/list.h> from user-visible part of reiserfs_xattr.h
Signed-off-by: David Woodhouse <[email protected]>
2006-04-25 14:52:51 +01:00
David Woodhouse 0409d3a332 Don't include private headers from user-visible parts of linux/quota.h
Signed-off-by: David Woodhouse <[email protected]>
2006-04-25 14:52:13 +01:00
David Woodhouse 997b7af2fe Don't include private headers from user-visible parts of include/linux/nfs*.h
Signed-off-by: David Woodhouse <[email protected]>
2006-04-25 14:51:45 +01:00
David Woodhouse eacf17bdbc Don't include <linux/stringify> from user-visible part of linux/net.h
Signed-off-by: David Woodhouse <[email protected]>
2006-04-25 14:46:09 +01:00
David Woodhouse 77597ad663 Don't include <linux/list.h> from user-visible part of linux/msg.h
Signed-off-by: David Woodhouse <[email protected]>
2006-04-25 14:26:46 +01:00
David Woodhouse 58908d093e Don't include private files from user-visible part of linux/ncp_fs.h
Signed-off-by: David Woodhouse <[email protected]>
2006-04-25 14:26:26 +01:00
David Woodhouse 9cdcb56636 Sanitise linux/mman.h for userspace consumption
It only really needs to define a few constants and include <asm/mman.h>
when it's used by userspace. Move the rest within #ifdef __KERNEL__

Signed-off-by: David Woodhouse <[email protected]>
2006-04-25 14:18:07 +01:00
David Woodhouse 8e442735ae Remove gratuitous inclusion of <linux/pci.h> from linux/isdn/tpam.h
Signed-off-by: David Woodhouse <[email protected]>
2006-04-25 14:16:14 +01:00
David Woodhouse 2e0e1f9f1c Don't include <linux/device.h> from user-visible part of linux/ipmi.h
Signed-off-by: David Woodhouse <[email protected]>
2006-04-25 14:15:44 +01:00
David Woodhouse a1b9298e55 Sanitise linux/i2c.h for userspace consumption
It was unconditionally including a whole bunch of headers which aren't
user-visible, and also exposing a lot of private internal stuff of its
own. Also fix some legacy character set to UTF-8 while we're at it.

Signed-off-by: David Woodhouse <[email protected]>
2006-04-25 14:14:52 +01:00
David Woodhouse 5a570cc0a4 Sanitise linux/i2c-algo-ite.h for userspace consumption
It doesn't need to include i2c.h, because a forward declaration of
struct i2c_adapter is perfectly sufficient. And it can be inside
#ifdef __KERNEL__ along with the kernel-internal structure definition.

Signed-off-by: David Woodhouse <[email protected]>
2006-04-25 14:10:40 +01:00