Commit graph

26204 commits

Author SHA1 Message Date
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
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
Linus Torvalds
454ac77845 Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable
* master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable:
  [CIFS] Fix compile error when CONFIG_CIFS_EXPERIMENTAL is undefined
2006-04-24 20:08:08 -07:00
Patrick McHardy
18118cdbfd [NETFILTER]: ipt action: use xt_check_target for basic verification
The targets don't do the basic verification themselves anymore so
the ipt action needs to take care of it.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-04-24 17:27:34 -07:00
Dmitry Mishin
91536b7ae6 [NETFILTER]: x_tables: move table->lock initialization
xt_table->lock should be initialized before xt_replace_table() call, which
uses it. This patch removes strict requirement that table should define
lock before registering.

Signed-off-by: Dmitry Mishin <dim@openvz.org>
Signed-off-by: Kirill Korotaev <dev@openvz.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-04-24 17:27:33 -07:00
Patrick McHardy
e4a79ef811 [NETFILTER]: ip6_tables: remove broken comefrom debugging
The introduction of x_tables broke comefrom debugging, remove it from
ip6_tables as well (ip_tables already got removed).

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-04-24 17:27:32 -07:00
Yasuyuki Kozakai
2c16b774c7 [NETFILTER]: nf_conntrack: kill unused callback init_conntrack
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-04-24 17:27:31 -07: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
Thomas Voegtle
44adf28f4a [NETFILTER]: ULOG target is not obsolete
The backend part is obsoleted, but the target itself is still needed.

Signed-off-by: Thomas Voegtle <tv@lio96.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-04-24 17:27:29 -07:00
Yasuyuki Kozakai
e1bbdebdba [NETFILTER]: nf_conntrack: Fix module refcount dropping too far
If nf_ct_l3proto_find_get() fails to get the refcount of
nf_ct_l3proto_generic, nf_ct_l3proto_put() will drop the refcount
too far.

This gets rid of '.me = THIS_MODULE' of nf_ct_l3proto_generic so that
nf_ct_l3proto_find_get() doesn't try to get refcount of it.
It's OK because its symbol is usable until nf_conntrack.ko is unloaded.

This also kills unnecessary NULL pointer check as well.
__nf_ct_proto_find() allways returns non-NULL pointer.

Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-04-24 17:27:28 -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
Steve French
301dc3e6f6 [CIFS] Fix compile error when CONFIG_CIFS_EXPERIMENTAL is undefined
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
2006-04-24 16:24:54 +00:00
Linus Torvalds
6b426e785c Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  [PARISC] MAINTAINERS
  [PARISC] Make ioremap default to _nocache
  [PARISC] Add new entries to the syscall table
  [PARISC] Further work for multiple page sizes
  [PARISC] Fix up hil_kbd.c mismerge
  [PARISC] defconfig updates
  [PARISC] Document that we tolerate "Relaxed Ordering"
  [PARISC] Misc. janitorial work
  [PARISC] EISA regions must be mapped NO_CACHE
  [PARISC] OSS ad1889: Match register names with ALSA driver
2006-04-23 09:44:10 -07:00
Linus Torvalds
cb6aef2879 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6:
  [PATCH] pcmcia/pcmcia_resource.c: fix crash when using Cardbus cards
  [PATCH] vrc4171: update config
  [PATCH] pcmcia: fix oops in static mapping case
  [PATCH] pcmcia: remove unneeded forward declarations
  [PATCH] pcmcia: do not set dev_node to NULL too early
  [PATCH] pcmcia: fix comment for pcmcia_load_firmware
  [PATCH] pcmcia: unload second device first
  [PATCH] pcmcia: add new ID to pcnet_cs
2006-04-23 09:43:21 -07:00
Linus Torvalds
950709a896 Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: possible cleanups
  drm: fixup r300 scratch on BE machines
2006-04-23 09:41:20 -07:00
Linus Torvalds
41bc3982b9 Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable
* master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable:
  [CIFS] Fix typo in previous
  [CIFS] Readdir fixes to allow search to start at arbitrary position
  [CIFS] Use the kthread_ API instead of opencoding lots of hairy code for kernel
  [CIFS] Don't allow a backslash in a path component
  [CIFS] [CIFS] Do not take rename sem on most path based calls (during
2006-04-23 09:38:09 -07:00
Linus Torvalds
a580e5b9a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge:
  powerpc: Fix define_machine so machine_is() works from modules
  powerpc/ppc: export strncasecmp
  [PATCH] powerpc: fix oops in alsa powermac driver
  [PATCH] powerpc: update {g5,iseries,pseries}_defconfigs
  [PATCH] ppc: Fix powersave code on arch/ppc
  [PATCH] powerpc/cell: remove BUILD_BUG_ON and add sys_tee to spu_syscall_table
  [PATCH] powermac: Fix i2c on keywest based chips
  [PATCH] powerpc: Lower threshold for DART enablement to 1GB
  [PATCH] powerpc: IOMMU support for honoring dma_mask
2006-04-23 09:36:31 -07:00
Dave Airlie
5d23fafb1b drm: possible cleanups
This patch contains the following possible cleanups:
- make the following needlessly global function static:
 - drm_bufs.c: drm_addbufs_fb()
- remove the following unused EXPORT_SYMBOL's:
 - drm_agpsupport.c: drm_agp_bind_memory
 - drm_bufs.c: drm_rmmap_locked
 - drm_bufs.c: drm_rmmap
 - drm_stub.c: drm_get_dev

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-04-23 18:26:40 +10:00
Dave Airlie
caa98c41c0 drm: fixup r300 scratch on BE machines
This fixes the r300 scratch stuff to work on PPC,
from Ben Herrenschmidt on IRC.

Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-04-23 18:14:00 +10:00
Steve French
b66ac3ea21 [CIFS] Fix typo in previous
Signed-off-by: Steve French <sfrench@us.ibm.com>
2006-04-23 01:54:50 +00:00
Paul Mackerras
d0e15bed84 powerpc: Fix define_machine so machine_is() works from modules
machine_is() was always returning 0 when used in a module, because
we weren't exporting the machine definitions.  This was why sound
wasn't working on powermacs when CONFIG_SND_POWERMAC=m.  Original
fix from Ben Herrenschmidt, further fixed by me.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-23 10:42:04 +10:00
Kylene Jo Hall
93e1b7d42e [PATCH] tpm: add HID module parameter
I recently found that not all BIOS manufacturers are using the specified
generic PNP id in their TPM ACPI table entry.  I have added the vendor
specific IDs that I know about and added a module parameter that a user can
specify another HID to the probe list if their device isn't being found by the
default list.

Signed-off-by: Kylene Hall <kjhall@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-04-22 09:19:55 -07:00
Kylene Jo Hall
5713556843 [PATCH] tpm: add interrupt module parameter
This patch adds a boolean module parameter that allows the user to turn
interrupt support on and off.  The default behavior is to attempt to use
interrupts.

Signed-off-by: Kylene Hall <kjhall@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-04-22 09:19:55 -07:00