summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge git://git.infradead.org/hdrcleanup-2.6Linus Torvalds2006-06-20905-1648/+842
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.infradead.org/hdrcleanup-2.6: (63 commits) [S390] __FD_foo definitions. Switch to __s32 types in joystick.h instead of C99 types for consistency. Add <sys/types.h> to headers included for userspace in <linux/input.h> Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h Remove struct fddi_statistics from user view in <linux/if_fddi.h> Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390 Revert include/media changes: Mauro says those ioctls are only used in-kernel(!) Include <linux/types.h> and use __uXX types in <linux/cramfs_fs.h> Use __uXX types in <linux/i2o_dev.h>, include <linux/ioctl.h> too Remove private struct dx_hash_info from public view in <linux/ext3_fs.h> Include <linux/types.h> and use __uXX types in <linux/affs_hardblocks.h> Use __uXX types in <linux/divert.h> for struct divert_blk et al. Use __u32 for elf_addr_t in <asm-powerpc/elf.h>, not u32. It's user-visible. Remove PPP_FCS from user view in <linux/ppp_defs.h>, remove __P mess entirely Use __uXX types in user-visible structures in <linux/nbd.h> Don't use 'u32' in user-visible struct ip_conntrack_old_tuple. Use __uXX types for S390 DASD volume label definitions which are user-visible S390 BIODASDREADCMB ioctl should use __u64 not u64 type. Remove unneeded inclusion of <linux/time.h> from <linux/ufs_fs.h> Fix private integer types used in V4L2 ioctls. ... Manually resolve conflict in include/linux/mtd/physmap.h
| * [S390] __FD_foo definitions.Martin Schwidefsky2006-06-141-16/+28
| | | | | | | | | | | | | | | | | | Make the definitions of __FD_SET, __FD_CLR and __FD_ISSET independent from asm/bitops.h and remove the macro magic that tests for __GLIBC__. Use simple C inline functions instead of set_bit, clear_bit and test_bit. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * Switch to __s32 types in joystick.h instead of C99 types for consistency.David Woodhouse2006-06-031-11/+11
| | | | | | | | | | | | | | The rest of the file uses these types instead of C99 types. Acked-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * Add <sys/types.h> to headers included for userspace in <linux/input.h>David Woodhouse2006-06-011-0/+1
| | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
| * Merge branch 'master' of ↵David Woodhouse2006-05-24432-3746/+9399
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: include/asm-powerpc/unistd.h include/asm-sparc/unistd.h include/asm-sparc64/unistd.h Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.hDavid Woodhouse2006-05-211-4/+4
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | Remove struct fddi_statistics from user view in <linux/if_fddi.h>David Woodhouse2006-05-161-0/+2
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390David Woodhouse2006-05-082-183/+214
| | | | | | | | | | | | | | | | | | | | | Also remove Bob Burroughs' email address, since it's no longer valid. Acked-by: Eric D Rossman <edrossma@us.ibm.com> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6David Woodhouse2006-05-06211-1441/+3293
| |\ \ | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Revert include/media changes: Mauro says those ioctls are only used in-kernel(!)David Woodhouse2006-05-061-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Reverts commit eba7f3bdb6344adee8a3d044f405ed38f5c66c6b Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Include <linux/types.h> and use __uXX types in <linux/cramfs_fs.h>David Woodhouse2006-05-041-20/+14
| | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Use __uXX types in <linux/i2o_dev.h>, include <linux/ioctl.h> tooDavid Woodhouse2006-05-041-87/+80
| | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Remove private struct dx_hash_info from public view in <linux/ext3_fs.h>David Woodhouse2006-05-041-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Include <linux/types.h> and use __uXX types in <linux/affs_hardblocks.h>David Woodhouse2006-05-041-35/+37
| | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Use __uXX types in <linux/divert.h> for struct divert_blk et al.David Woodhouse2006-05-041-10/+10
| | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Use __u32 for elf_addr_t in <asm-powerpc/elf.h>, not u32. It's user-visible.David Woodhouse2006-05-041-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Remove PPP_FCS from user view in <linux/ppp_defs.h>, remove __P mess entirelyDavid Woodhouse2006-05-041-10/+4
| | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Use __uXX types in user-visible structures in <linux/nbd.h>David Woodhouse2006-05-041-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Don't use 'u32' in user-visible struct ip_conntrack_old_tuple.David Woodhouse2006-05-041-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Use __uXX types for S390 DASD volume label definitions which are user-visibleDavid Woodhouse2006-05-041-19/+19
| | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | S390 BIODASDREADCMB ioctl should use __u64 not u64 type.David Woodhouse2006-05-041-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Remove unneeded inclusion of <linux/time.h> from <linux/ufs_fs.h>David Woodhouse2006-05-041-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Fix private integer types used in V4L2 ioctls.David Woodhouse2006-05-041-8/+8
| | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Fix integer types in <sound/hdsp.h> SNDRV_HDSP_IOCTL_GET_PEAK_RMS ioctlDavid Woodhouse2006-05-041-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | We should be using __u32 et al, not the kernel-private types. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Restore __attribute_const__ to user-visibility in linux/compiler.h...for nowDavid Woodhouse2006-05-041-9/+10
| | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Guard some of linux/compiler.h with #ifdef __KERNEL__David Woodhouse2006-05-021-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6David Woodhouse2006-05-0176-331/+751
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverting c7afb48eb5147be9eb9789b4161462d246451ac2 since a better (but more intrusive) fix is now merged upstream. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * \ \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6David Woodhouse2006-04-3040-2155/+1240
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | | | Sanitise ethtool.h and mii.h for userspace.David Woodhouse2006-04-292-98/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <dwmw2@infradead.org>
| * | | | | Remove unneeded _syscallX macros from user view in asm-*/unistd.hDavid Woodhouse2006-04-2921-86/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These aren't needed by glibc or klibc, and they're broken in some cases anyway. The uClibc folks are apparently switching over to stop using them too (now that we agreed that they should be dropped, at least). Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | | | Remove 'extern int errno;' from public view in linux/unistd.hDavid Woodhouse2006-04-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | | | Remove struct input_device_id from public view in linux/input.hDavid Woodhouse2006-04-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <dwmw2@infradead.org>
| * | | | | Don't include <linux/mod_devicetable.h> in public part of linux/pci.hDavid Woodhouse2006-04-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6David Woodhouse2006-04-29202-2551/+4026
| |\ \ \ \ \
| * | | | | | linux/blkpg.h needs <linux/compiler.h> for __userDavid Woodhouse2006-04-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | | | | Exclude asm-generic/{page,memory_model}.h from user bits of i386/x86_64 page.hDavid Woodhouse2006-04-272-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | | | | Add standard include guard to asm-generic/signal and use compiler.hDavid Woodhouse2006-04-271-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | | | | Don't include implementation details from asm-s390/ptrace.h and page.hDavid Woodhouse2006-04-272-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | | | | Sanitise linux/sched.h for userspace consumptionDavid Woodhouse2006-04-271-39/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | Sanitise linux/audit.h for userspace consumption, split elf-em.h from elf.hDavid Woodhouse2006-04-273-60/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | Don't include linux/config.h from anywhere else in include/David Woodhouse2006-04-26836-839/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | | | | Don't include <linux/config.h> and <linux/linkage.h> from linux/socket.hDavid Woodhouse2006-04-251-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | | | | Don't include private headers from user-visible part of linux/ext3_fs.hDavid Woodhouse2006-04-251-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | | | | Don't include private headers from user-visible part of linux/ext2_fs.hDavid Woodhouse2006-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | | | | Don't include private headers from user-visible part of linux/smb_fs.hDavid Woodhouse2006-04-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | | | | Sanitise linux/sunrpc/debug.h for userspace consumptionDavid Woodhouse2006-04-251-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | Don't export CONFIG_COMPAT stuff in linux/usbdevice_fs.h to userspaceDavid Woodhouse2006-04-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | | | | Don't include <linux/spinlock.h> from user-visible part of linux/wanrouter.hDavid Woodhouse2006-04-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | | | | Move comment in mtd-abi.h to stop confusing unifdefDavid Woodhouse2006-04-251-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | Don't include private headers from user-visible part of linux/signal.hDavid Woodhouse2006-04-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
OpenPOWER on IntegriCloud