[netfilter-cvslog] r4405 - in trunk/nfsim: . core/ipv4 kernelenv/include

[rusty at netfilter.org]

Author: rusty at netfilter.org
Date: 2005-10-31 07:21:04 +0100 (Mon, 31 Oct 2005)
New Revision: 4405

Modified:
   trunk/nfsim/.links
   trunk/nfsim/core/ipv4/ipv4.h
   trunk/nfsim/kernelenv/include/kernelenv.h
Log:
Minor tweaks for 2.6.14 proper

Modified: trunk/nfsim/.links
===================================================================
--- trunk/nfsim/.links	2005-10-31 06:14:47 UTC (rev 4404)
+++ trunk/nfsim/.links	2005-10-31 06:21:04 UTC (rev 4405)
@@ -44,6 +44,7 @@
 ./linux/security.h
 ./linux/compiler.h
 ./linux/jhash.h
+./linux/cpumask.h
 ./asm/uaccess.h
 ./asm/semaphore.h
 ./asm/system.h

Modified: trunk/nfsim/core/ipv4/ipv4.h
===================================================================
--- trunk/nfsim/core/ipv4/ipv4.h	2005-10-31 06:14:47 UTC (rev 4404)
+++ trunk/nfsim/core/ipv4/ipv4.h	2005-10-31 06:21:04 UTC (rev 4405)
@@ -524,6 +524,7 @@
 {
 	return (struct in_device*)dev->ip_ptr;
 }
+#define __in_dev_get_rcu __in_dev_get
 
 static inline unsigned int netmask_bits(uint32_t netmask)
 {

Modified: trunk/nfsim/kernelenv/include/kernelenv.h
===================================================================
--- trunk/nfsim/kernelenv/include/kernelenv.h	2005-10-31 06:14:47 UTC (rev 4404)
+++ trunk/nfsim/kernelenv/include/kernelenv.h	2005-10-31 06:21:04 UTC (rev 4405)
@@ -188,6 +188,7 @@
 #define cpu_possible(cpu)	((cpu) == 0)
 #endif
 #define smp_processor_id()	0
+#define highest_possible_processor_id()	0
 #define PAGE_SHIFT      12
 #define PAGE_SIZE	(1UL << PAGE_SHIFT)
 #define PAGE_MASK	(~(PAGE_SIZE-1))