Commit graph

7570 commits

Author SHA1 Message Date
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 <axboe@suse.de>
2006-04-27 08:59:48 +02:00
David Woodhouse
ad15887986 Add standard include guard to asm-generic/signal and use compiler.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2006-04-27 06:57:23 +01:00
David Woodhouse
274f5946dc Don't include implementation details from asm-s390/ptrace.h and page.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2006-04-27 04:47:10 +01: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 <dwmw2@infradead.org>
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 <dwmw2@infradead.org>
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 <axboe@suse.de>
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 <dwmw2@infradead.org>
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 <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 06:19:45 -04:00
Jeff Garzik
00355cd938 Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream 2006-04-26 06:18:15 -04:00
Jeff Garzik
45de6fd958 Merge branch 'upstream-fixes' into upstream 2006-04-26 06:18:00 -04:00
Jeff Garzik
3b908870b8 Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes 2006-04-26 06:16:50 -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 <axboe@suse.de>
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 <dtor@mail.ru>
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 <dtor@mail.ru>
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 <imre.deak@nokia.com>
Acked-by: Juha Yrjola <juha.yrjola@nokia.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
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 <dwmw2@infradead.org>
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 <dwmw2@infradead.org>
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 <dwmw2@infradead.org>
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 <dwmw2@infradead.org>
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 <dwmw2@infradead.org>
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 <dwmw2@infradead.org>
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 <dwmw2@infradead.org>
2006-04-25 15:00:56 +01:00
David Woodhouse
c6e82e7236 Move comment in mtd-abi.h to stop confusing unifdef
Currently, unifdef removes the comment which starts on the same line as
the #ifdef __KERNEL__, but leaves the second line of the comment in place.

Move the comment onto a separate line.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2006-04-25 15:00:06 +01:00
David Woodhouse
7ab2febd4d Don't include private headers from user-visible part of linux/signal.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
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 <dwmw2@infradead.org>
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 <dwmw2@infradead.org>
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 <dwmw2@infradead.org>
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 <dwmw2@infradead.org>
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 <dwmw2@infradead.org>
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 <dwmw2@infradead.org>
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 <dwmw2@infradead.org>
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 <dwmw2@infradead.org>
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 <dwmw2@infradead.org>
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 <dwmw2@infradead.org>
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 <dwmw2@infradead.org>
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 <dwmw2@infradead.org>
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 <dwmw2@infradead.org>
2006-04-25 14:10:40 +01:00
David Woodhouse
34186efc17 Include various private files only from within __KERNEL__ in genhd.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2006-04-25 14:07:57 +01:00
David Woodhouse
f2999e4ea4 Export only the appropriate GS_xxx flags to userspace from generic_serial.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2006-04-25 14:07:02 +01:00
David Woodhouse
25478bb26f Use __KERNEL__ to hide kernel-private bits of linux/gameport.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2006-04-25 13:59:30 +01:00
David Woodhouse
72b9760b65 Don't include agp_backend.h in user-visible part of agpgart.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2006-04-25 13:58:23 +01:00
David Woodhouse
a1ff0eafce Include <linux/jiffies.h> from linux/acct.h only in kernel-private part.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2006-04-25 13:57:44 +01:00
David Woodhouse
dd02ec3ac2 Remove user-visible references to PAGE_SIZE in include/asm-powerpc/elf.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2006-04-25 13:51:52 +01:00
Patrick McHardy
55fe586636 [NETFILTER]: Fix compat_xt_counters alignment for non-x86
Some (?) non-x86 architectures require 8byte alignment for u_int64_t
even when compiled for 32bit, using u_int32_t in compat_xt_counters
breaks on these architectures, use u_int64_t for everything but x86.

Reported by Andreas Schwab <schwab@suse.de>.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-04-24 17:27:30 -07:00
OGAWA Hirofumi
d8fe3f1920 [SPARC]: __NR_sys removal
__NR_sys_sync_file_range part was lost somewhere...
[glibc is already checking __NR_sync_file_range]

Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-04-24 13:48:51 -07:00
Johannes Berg
9a1771e867 [PATCH] softmac: add SIOCSIWMLME
This patch adds the SIOCSIWMLME wext to softmac, this functionality
appears to be used by wpa_supplicant and is softmac-specific.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: Jouni Malinen <jkm@devicescape.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2006-04-24 16:15:58 -04:00
Zhu Yi
45a62ab3d6 [PATCH] ieee80211: update version stamp to 1.1.13
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2006-04-24 16:15:54 -04:00