From 6197179c6cf949eef23890064fa3cf716693553e Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Fri, 28 Jan 2005 05:16:37 +0000 Subject: [PATCH] fixed merge mistake that picked up 2.6.9 rather than 2.6.9-1.11_FC2 code --- arch/i386/mm/init.c | 7 ------- fs/ncpfs/file.c | 2 +- init/main.c | 6 ------ ipc/msg.c | 1 + net/core/dev.c | 1 - net/ipv4/devinet.c | 1 - net/netlink/af_netlink.c | 2 -- net/sunrpc/svcauth_unix.c | 2 -- 8 files changed, 2 insertions(+), 20 deletions(-) diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c index bf2ee83b1..41047628e 100644 --- a/arch/i386/mm/init.c +++ b/arch/i386/mm/init.c @@ -225,13 +225,6 @@ static inline int page_is_ram(unsigned long pagenr) return 0; } -/* To enable modules to check if a page is in RAM */ -int pfn_is_ram(unsigned long pfn) -{ - return (page_is_ram(pfn)); -} - - /* * devmem_is_allowed() checks to see if /dev/mem access to a certain address is * valid. The argument is a physical page number. diff --git a/fs/ncpfs/file.c b/fs/ncpfs/file.c index 701859ef8..022cd1802 100644 --- a/fs/ncpfs/file.c +++ b/fs/ncpfs/file.c @@ -170,7 +170,7 @@ ncp_file_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) *ppos = pos; -#warning MEF removed some READONLY MOUNT support -- look for it again in vs1.9.3 + if (!IS_RDONLY(inode) || (file && MNT_IS_RDONLY(file->f_vfsmnt))) { file_accessed(file); DPRINTK("ncp_file_read: exit %s/%s\n", diff --git a/init/main.c b/init/main.c index 764ff0a53..ebc923c55 100644 --- a/init/main.c +++ b/init/main.c @@ -533,10 +533,6 @@ asmlinkage void __init start_kernel(void) rcu_init(); init_IRQ(); pidhash_init(); - /* MEF: In 2.6.5. ckrm_init was right after pidhash_init() but - before sched_init(). Will leave it after pidhash_init() - and cross finger. - */ ckrm_init(); init_timers(); softirq_init(); @@ -588,7 +584,6 @@ asmlinkage void __init start_kernel(void) #ifdef CONFIG_PROC_FS proc_root_init(); #endif - check_bugs(); acpi_early_init(); /* before LAPIC and SMP init */ @@ -731,7 +726,6 @@ static int init(void * unused) * firmware files. */ populate_rootfs(); - do_basic_setup(); init_ckrm_sched_res(); diff --git a/ipc/msg.c b/ipc/msg.c index 91e292402..095f2b747 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -763,6 +763,7 @@ asmlinkage long sys_msgrcv (int msqid, struct msgbuf __user *msgp, size_t msgsz, cpu_relax(); msg = (struct msg_msg*) msr_d.r_msg; } + /* Lockless receive, part 3: * If there is a message or an error then accept it without * locking. diff --git a/net/core/dev.c b/net/core/dev.c index e917b514d..460463dd4 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -113,7 +113,6 @@ #include #endif /* CONFIG_NET_RADIO */ #include -#include #include /* This define, if set, will randomly drop a packet when congestion diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 3ad6fee14..19eb795a1 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -1046,7 +1046,6 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb) struct net_device *dev; struct in_device *in_dev; struct in_ifaddr *ifa; - struct sock *sk = skb->sk; int s_ip_idx, s_idx = cb->args[0]; s_ip_idx = ip_idx = cb->args[1]; diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index bba867715..360913944 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -800,8 +800,6 @@ int netlink_broadcast(struct sock *ssk, struct sk_buff *skb, u32 pid, netlink_trim(skb, allocation); - netlink_trim(skb, allocation); - /* While we sleep in clone, do not allow to change socket list */ netlink_lock_table(); diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c index fa22061f7..283231248 100644 --- a/net/sunrpc/svcauth_unix.c +++ b/net/sunrpc/svcauth_unix.c @@ -172,8 +172,6 @@ static int ip_map_parse(struct cache_detail *cd, /* class */ len = qword_get(&mesg, ipm.m_class, sizeof(ipm.m_class)); if (len <= 0) return -EINVAL; - if (len >= sizeof(ipm.m_class)) - return -EINVAL; /* ip address */ len = qword_get(&mesg, buf, mlen); -- 2.47.0