From bcb5d985c8483260f4f431a7e951052ede0f63e0 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 10 Jan 2006 21:31:24 -0800 Subject: [PATCH] --- yaml --- r: 17852 b: refs/heads/master c: 05f6ece6f37f987e9de643f6f76e8fb5d5b9e014 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/cpusets.txt | 4 ++-- trunk/Documentation/laptop-mode.txt | 6 +++--- trunk/MAINTAINERS | 2 +- trunk/arch/i386/boot/Makefile | 2 +- trunk/drivers/net/gianfar_sysfs.c | 2 +- trunk/fs/afs/cmservice.c | 2 +- trunk/fs/attr.c | 1 - trunk/fs/binfmt_elf.c | 8 ++++---- trunk/fs/ext2/dir.c | 2 +- trunk/fs/proc/vmcore.c | 1 - trunk/fs/xfs/xfs_iomap.c | 1 - trunk/include/asm-powerpc/elf.h | 1 - trunk/mm/swapfile.c | 2 +- trunk/net/core/wireless.c | 1 + trunk/net/decnet/netfilter/dn_rtmsg.c | 2 -- trunk/net/ipv4/netfilter/ip_conntrack_proto_icmp.c | 1 - trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c | 1 - trunk/net/ipv4/netfilter/ip_conntrack_proto_udp.c | 1 - trunk/net/ipv6/Makefile | 3 ++- trunk/net/ipv6/netfilter.c | 5 ++++- 21 files changed, 23 insertions(+), 27 deletions(-) diff --git a/[refs] b/[refs] index b42bb4e9c712..f23db82c3a23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58b6c58caef7a34eab7ec887288fa495696653e7 +refs/heads/master: 05f6ece6f37f987e9de643f6f76e8fb5d5b9e014 diff --git a/trunk/Documentation/cpusets.txt b/trunk/Documentation/cpusets.txt index 9e49b1c35729..990998ee10b6 100644 --- a/trunk/Documentation/cpusets.txt +++ b/trunk/Documentation/cpusets.txt @@ -135,7 +135,7 @@ Cpusets extends these two mechanisms as follows: The implementation of cpusets requires a few, simple hooks into the rest of the kernel, none in performance critical paths: - - in main/init.c, to initialize the root cpuset at system boot. + - in init/main.c, to initialize the root cpuset at system boot. - in fork and exit, to attach and detach a task from its cpuset. - in sched_setaffinity, to mask the requested CPUs by what's allowed in that tasks cpuset. @@ -146,7 +146,7 @@ into the rest of the kernel, none in performance critical paths: and related changes in both sched.c and arch/ia64/kernel/domain.c - in the mbind and set_mempolicy system calls, to mask the requested Memory Nodes by what's allowed in that tasks cpuset. - - in page_alloc, to restrict memory to allowed nodes. + - in page_alloc.c, to restrict memory to allowed nodes. - in vmscan.c, to restrict page recovery to the current cpuset. In addition a new file system, of type "cpuset" may be mounted, diff --git a/trunk/Documentation/laptop-mode.txt b/trunk/Documentation/laptop-mode.txt index dc4e810afdcd..f42e4c089356 100644 --- a/trunk/Documentation/laptop-mode.txt +++ b/trunk/Documentation/laptop-mode.txt @@ -3,7 +3,7 @@ How to conserve battery power using laptop-mode Document Author: Bart Samwel (bart@samwel.tk) Date created: January 2, 2004 -Last modified: July 10, 2004 +Last modified: December 06, 2004 Introduction ------------ @@ -33,7 +33,7 @@ or anything. Simply install all the files included in this document, and laptop mode will automatically be started when you're on battery. For your convenience, a tarball containing an installer can be downloaded at: -http://www.xs4all.nl/~bsamwel/laptop_mode/tools +http://www.xs4all.nl/~bsamwel/laptop_mode/tools/ To configure laptop mode, you need to edit the configuration file, which is located in /etc/default/laptop-mode on Debian-based systems, or in @@ -912,7 +912,7 @@ void usage() exit(0); } -int main(int ac, char **av) +int main(int argc, char **argv) { int fd; char *disk = 0; diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 090e10b65b09..b6416a293ec9 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2487,7 +2487,7 @@ P: Paul Mundt M: lethal@linux-sh.org P: Kazumoto Kojima M: kkojima@rr.iij4u.or.jp -L: linux-sh@m17n.org +L: linuxsh-dev@lists.sourceforge.net W: http://www.linux-sh.org W: http://www.m17n.org/linux-sh/ W: http://www.rr.iij4u.or.jp/~kkojima/linux-sh4.html diff --git a/trunk/arch/i386/boot/Makefile b/trunk/arch/i386/boot/Makefile index 0fea75dd4e31..f136752563b1 100644 --- a/trunk/arch/i386/boot/Makefile +++ b/trunk/arch/i386/boot/Makefile @@ -101,4 +101,4 @@ zlilo: $(BOOTIMAGE) if [ -x /sbin/lilo ]; then /sbin/lilo; else /etc/lilo/install; fi install: - sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $< System.map "$(INSTALL_PATH)" + sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)" diff --git a/trunk/drivers/net/gianfar_sysfs.c b/trunk/drivers/net/gianfar_sysfs.c index 10d34cb19192..51ef181b1368 100644 --- a/trunk/drivers/net/gianfar_sysfs.c +++ b/trunk/drivers/net/gianfar_sysfs.c @@ -7,7 +7,7 @@ * Based on 8260_io/fcc_enet.c * * Author: Andy Fleming - * Maintainer: Kumar Gala (kumar.gala@freescale.com) + * Maintainer: Kumar Gala (galak@kernel.crashing.org) * * Copyright (c) 2002-2005 Freescale Semiconductor, Inc. * diff --git a/trunk/fs/afs/cmservice.c b/trunk/fs/afs/cmservice.c index 0a57fd7c726f..9eef6bf156ab 100644 --- a/trunk/fs/afs/cmservice.c +++ b/trunk/fs/afs/cmservice.c @@ -118,7 +118,7 @@ static int kafscmd(void *arg) _SRXAFSCM_xxxx_t func; int die; - printk("kAFS: Started kafscmd %d\n", current->pid); + printk(KERN_INFO "kAFS: Started kafscmd %d\n", current->pid); daemonize("kafscmd"); diff --git a/trunk/fs/attr.c b/trunk/fs/attr.c index b34732506f1d..d63e5096f2f2 100644 --- a/trunk/fs/attr.c +++ b/trunk/fs/attr.c @@ -14,7 +14,6 @@ #include #include #include -#include /* Taken over from the old code... */ diff --git a/trunk/fs/binfmt_elf.c b/trunk/fs/binfmt_elf.c index a4f6f57d91aa..f979ebbce49c 100644 --- a/trunk/fs/binfmt_elf.c +++ b/trunk/fs/binfmt_elf.c @@ -1634,17 +1634,17 @@ static int elf_core_dump(long signr, struct pt_regs * regs, struct file * file) ELF_CORE_WRITE_EXTRA_DATA; #endif - if ((off_t) file->f_pos != offset) { + if ((off_t)file->f_pos != offset) { /* Sanity check */ - printk("elf_core_dump: file->f_pos (%ld) != offset (%ld)\n", - (off_t) file->f_pos, offset); + printk(KERN_WARNING "elf_core_dump: file->f_pos (%ld) != offset (%ld)\n", + (off_t)file->f_pos, offset); } end_coredump: set_fs(fs); cleanup: - while(!list_empty(&thread_list)) { + while (!list_empty(&thread_list)) { struct list_head *tmp = thread_list.next; list_del(tmp); kfree(list_entry(tmp, struct elf_thread_status, list)); diff --git a/trunk/fs/ext2/dir.c b/trunk/fs/ext2/dir.c index 5b5f52876b42..7442bdd1267a 100644 --- a/trunk/fs/ext2/dir.c +++ b/trunk/fs/ext2/dir.c @@ -592,7 +592,7 @@ int ext2_make_empty(struct inode *inode, struct inode *parent) goto fail; } kaddr = kmap_atomic(page, KM_USER0); - memset(kaddr, 0, chunk_size); + memset(kaddr, 0, chunk_size); de = (struct ext2_dir_entry_2 *)kaddr; de->name_len = 1; de->rec_len = cpu_to_le16(EXT2_DIR_REC_LEN(1)); diff --git a/trunk/fs/proc/vmcore.c b/trunk/fs/proc/vmcore.c index 5378d7c78419..124e35442ac8 100644 --- a/trunk/fs/proc/vmcore.c +++ b/trunk/fs/proc/vmcore.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/trunk/fs/xfs/xfs_iomap.c b/trunk/fs/xfs/xfs_iomap.c index 45a77a3a6c07..ca7afc83a893 100644 --- a/trunk/fs/xfs/xfs_iomap.c +++ b/trunk/fs/xfs/xfs_iomap.c @@ -40,7 +40,6 @@ #include "xfs_ialloc.h" #include "xfs_btree.h" #include "xfs_bmap.h" -#include "xfs_bit.h" #include "xfs_rtalloc.h" #include "xfs_error.h" #include "xfs_itable.h" diff --git a/trunk/include/asm-powerpc/elf.h b/trunk/include/asm-powerpc/elf.h index c5a635d9bba4..45f2af6f89c4 100644 --- a/trunk/include/asm-powerpc/elf.h +++ b/trunk/include/asm-powerpc/elf.h @@ -92,7 +92,6 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#include #define ELF_NGREG 48 /* includes nip, msr, lr, etc. */ #define ELF_NFPREG 33 /* includes fpscr */ diff --git a/trunk/mm/swapfile.c b/trunk/mm/swapfile.c index 6544565a7c0f..d8a5afc8b2a3 100644 --- a/trunk/mm/swapfile.c +++ b/trunk/mm/swapfile.c @@ -1442,7 +1442,7 @@ asmlinkage long sys_swapon(const char __user * specialfile, int swap_flags) else if (!memcmp("SWAPSPACE2",swap_header->magic.magic,10)) swap_header_version = 2; else { - printk("Unable to find swap-space signature\n"); + printk(KERN_ERR "Unable to find swap-space signature\n"); error = -EINVAL; goto bad_swap; } diff --git a/trunk/net/core/wireless.c b/trunk/net/core/wireless.c index f88b0affb3b9..2add7ed609e9 100644 --- a/trunk/net/core/wireless.c +++ b/trunk/net/core/wireless.c @@ -78,6 +78,7 @@ #include #include /* for __init */ #include /* ARPHRD_ETHER */ +#include /* compare_ether_addr */ #include /* Pretty obvious */ #include /* New driver API */ diff --git a/trunk/net/decnet/netfilter/dn_rtmsg.c b/trunk/net/decnet/netfilter/dn_rtmsg.c index 1ab94c6e22ed..16a5a31e2126 100644 --- a/trunk/net/decnet/netfilter/dn_rtmsg.c +++ b/trunk/net/decnet/netfilter/dn_rtmsg.c @@ -26,8 +26,6 @@ #include #include -#include - static struct sock *dnrmg = NULL; diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_proto_icmp.c b/trunk/net/ipv4/netfilter/ip_conntrack_proto_icmp.c index f2a90e2743d7..3021af0910f1 100644 --- a/trunk/net/ipv4/netfilter/ip_conntrack_proto_icmp.c +++ b/trunk/net/ipv4/netfilter/ip_conntrack_proto_icmp.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c index ea2b39c18050..e0dc37063545 100644 --- a/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c +++ b/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c @@ -32,7 +32,6 @@ #include -#include #include #include #include diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_proto_udp.c b/trunk/net/ipv4/netfilter/ip_conntrack_proto_udp.c index 004003fd6117..55b7d3210adf 100644 --- a/trunk/net/ipv4/netfilter/ip_conntrack_proto_udp.c +++ b/trunk/net/ipv4/netfilter/ip_conntrack_proto_udp.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include diff --git a/trunk/net/ipv6/Makefile b/trunk/net/ipv6/Makefile index bf18cff13120..41877abd22e6 100644 --- a/trunk/net/ipv6/Makefile +++ b/trunk/net/ipv6/Makefile @@ -12,13 +12,14 @@ ipv6-objs := af_inet6.o anycast.o ip6_output.o ip6_input.o addrconf.o sit.o \ ipv6-$(CONFIG_XFRM) += xfrm6_policy.o xfrm6_state.o xfrm6_input.o \ xfrm6_output.o +ipv6-$(CONFIG_NETFILTER) += netfilter.o ipv6-objs += $(ipv6-y) obj-$(CONFIG_INET6_AH) += ah6.o obj-$(CONFIG_INET6_ESP) += esp6.o obj-$(CONFIG_INET6_IPCOMP) += ipcomp6.o obj-$(CONFIG_INET6_TUNNEL) += xfrm6_tunnel.o -obj-$(CONFIG_NETFILTER) += netfilter.o netfilter/ +obj-$(CONFIG_NETFILTER) += netfilter/ obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o diff --git a/trunk/net/ipv6/netfilter.c b/trunk/net/ipv6/netfilter.c index 1ab62f033664..d750cfc019dc 100644 --- a/trunk/net/ipv6/netfilter.c +++ b/trunk/net/ipv6/netfilter.c @@ -90,7 +90,10 @@ int __init ipv6_netfilter_init(void) return nf_register_queue_rerouter(PF_INET6, &ip6_reroute); } -void __exit ipv6_netfilter_fini(void) +/* This can be called from inet6_init() on errors, so it cannot + * be marked __exit. -DaveM + */ +void ipv6_netfilter_fini(void) { nf_unregister_queue_rerouter(PF_INET6); }