diff -urN --exclude-from=/home/davej/.exclude linux/arch/i386/kernel/irq.c linux-dj/arch/i386/kernel/irq.c
--- linux/arch/i386/kernel/irq.c	Fri Mar  9 03:28:59 2001
+++ linux-dj/arch/i386/kernel/irq.c	Fri Mar  9 03:40:52 2001
@@ -479,7 +479,7 @@
  *	This function may be called from IRQ context.
  */
  
-void inline disable_irq_nosync(unsigned int irq)
+inline void disable_irq_nosync(unsigned int irq)
 {
 	irq_desc_t *desc = irq_desc + irq;
 	unsigned long flags;
diff -urN --exclude-from=/home/davej/.exclude linux/arch/i386/kernel/traps.c linux-dj/arch/i386/kernel/traps.c
--- linux/arch/i386/kernel/traps.c	Fri Mar  9 03:28:59 2001
+++ linux-dj/arch/i386/kernel/traps.c	Fri Mar  9 03:40:52 2001
@@ -233,7 +233,7 @@
 	return address;
 }
 
-static void inline do_trap(int trapnr, int signr, char *str, int vm86,
+static inline void do_trap(int trapnr, int signr, char *str, int vm86,
 			   struct pt_regs * regs, long error_code, siginfo_t *info)
 {
 	if (vm86 && regs->eflags & VM_MASK)
diff -urN --exclude-from=/home/davej/.exclude linux/drivers/block/ll_rw_blk.c linux-dj/drivers/block/ll_rw_blk.c
--- linux/drivers/block/ll_rw_blk.c	Fri Mar  9 03:29:01 2001
+++ linux-dj/drivers/block/ll_rw_blk.c	Fri Mar  9 03:42:14 2001
@@ -590,7 +590,7 @@
 	list_add(&req->queue, insert_here);
 }
 
-void inline blk_refill_freelist(request_queue_t *q, int rw)
+inline void blk_refill_freelist(request_queue_t *q, int rw)
 {
 	if (q->pending_free[rw]) {
 		list_splice(&q->pending_freelist[rw], &q->request_freelist[rw]);
@@ -602,7 +602,7 @@
 /*
  * Must be called with io_request_lock held and interrupts disabled
  */
-void inline blkdev_release_request(struct request *req)
+inline void blkdev_release_request(struct request *req)
 {
 	request_queue_t *q = req->q;
 	int rw = req->cmd;
diff -urN --exclude-from=/home/davej/.exclude linux/drivers/char/serial.c linux-dj/drivers/char/serial.c
--- linux/drivers/char/serial.c	Fri Mar  9 03:29:02 2001
+++ linux-dj/drivers/char/serial.c	Fri Mar  9 03:41:53 2001
@@ -4957,7 +4957,7 @@
 	{	0, }
 };
 
-static void inline avoid_irq_share(struct pci_dev *dev)
+static inline void avoid_irq_share(struct pci_dev *dev)
 {
 	int i, map = 0x1FF8;
 	struct serial_state *state = rs_table;
@@ -4994,7 +4994,7 @@
        return 0;
 }
 
-static int inline check_compatible_id(struct pci_dev *dev)
+static inline int check_compatible_id(struct pci_dev *dev)
 {
        int i;
        for (i = 0; i < DEVICE_COUNT_COMPATIBLE; i++)
diff -urN --exclude-from=/home/davej/.exclude linux/drivers/usb/uhci-debug.h linux-dj/drivers/usb/uhci-debug.h
--- linux/drivers/usb/uhci-debug.h	Fri Mar  9 03:29:14 2001
+++ linux-dj/drivers/usb/uhci-debug.h	Fri Mar  9 03:41:42 2001
@@ -213,7 +213,7 @@
 	return out - buf;
 }
 
-static int inline uhci_is_skeleton_td(struct uhci *uhci, struct uhci_td *td)
+inline static int uhci_is_skeleton_td(struct uhci *uhci, struct uhci_td *td)
 {
 	int i;
 
@@ -224,7 +224,7 @@
 	return 0;
 }
 
-static int inline uhci_is_skeleton_qh(struct uhci *uhci, struct uhci_qh *qh)
+inline static int uhci_is_skeleton_qh(struct uhci *uhci, struct uhci_qh *qh)
 {
 	int i;
 
diff -urN --exclude-from=/home/davej/.exclude linux/drivers/usb/uhci.c linux-dj/drivers/usb/uhci.c
--- linux/drivers/usb/uhci.c	Fri Mar  9 03:29:14 2001
+++ linux-dj/drivers/usb/uhci.c	Fri Mar  9 03:41:42 2001
@@ -197,7 +197,7 @@
 	return td;
 }
 
-static void inline uhci_fill_td(struct uhci_td *td, __u32 status,
+inline static void uhci_fill_td(struct uhci_td *td, __u32 status,
 		__u32 info, __u32 buffer)
 {
 	td->status = status;
diff -urN --exclude-from=/home/davej/.exclude linux/fs/nfsd/nfssvc.c linux-dj/fs/nfsd/nfssvc.c
--- linux/fs/nfsd/nfssvc.c	Fri Mar  9 03:29:18 2001
+++ linux-dj/fs/nfsd/nfssvc.c	Fri Mar  9 03:40:24 2001
@@ -117,7 +117,7 @@
 	return error;
 }
 
-static void inline
+inline static void
 update_thread_usage(int busy_threads)
 {
 	unsigned long prev_call;
diff -urN --exclude-from=/home/davej/.exclude linux/include/asm-i386/system.h linux-dj/include/asm-i386/system.h
--- linux/include/asm-i386/system.h	Fri Mar  9 03:29:20 2001
+++ linux-dj/include/asm-i386/system.h	Fri Mar  9 03:43:03 2001
@@ -158,7 +158,7 @@
 			"ax","dx","memory");
 }
 
-extern void inline __set_64bit_constant (unsigned long long *ptr,
+inline extern void __set_64bit_constant (unsigned long long *ptr,
 						 unsigned long long value)
 {
 	__set_64bit(ptr,(unsigned int)(value), (unsigned int)((value)>>32ULL));
@@ -166,7 +166,7 @@
 #define ll_low(x)	*(((unsigned int*)&(x))+0)
 #define ll_high(x)	*(((unsigned int*)&(x))+1)
 
-extern void inline __set_64bit_var (unsigned long long *ptr,
+inline extern void __set_64bit_var (unsigned long long *ptr,
 			 unsigned long long value)
 {
 	__set_64bit(ptr,ll_low(value), ll_high(value));
diff -urN --exclude-from=/home/davej/.exclude linux/include/net/sock.h linux-dj/include/net/sock.h
--- linux/include/net/sock.h	Fri Mar  9 03:29:22 2001
+++ linux-dj/include/net/sock.h	Fri Mar  9 03:42:40 2001
@@ -732,12 +732,12 @@
 };
 
 /* Called with local bh disabled */
-static void __inline__ sock_prot_inc_use(struct proto *prot)
+static __inline__ void sock_prot_inc_use(struct proto *prot)
 {
 	prot->stats[smp_processor_id()].inuse++;
 }
 
-static void __inline__ sock_prot_dec_use(struct proto *prot)
+static __inline__ void sock_prot_dec_use(struct proto *prot)
 {
 	prot->stats[smp_processor_id()].inuse--;
 }
diff -urN --exclude-from=/home/davej/.exclude linux/ipc/msg.c linux-dj/ipc/msg.c
--- linux/ipc/msg.c	Fri Mar  9 03:29:22 2001
+++ linux-dj/ipc/msg.c	Fri Mar  9 03:40:31 2001
@@ -597,7 +597,7 @@
 	return 0;
 }
 
-int inline pipelined_send(struct msg_queue* msq, struct msg_msg* msg)
+inline int pipelined_send(struct msg_queue* msq, struct msg_msg* msg)
 {
 	struct list_head* tmp;
 
@@ -705,7 +705,7 @@
 	return err;
 }
 
-int inline convert_mode(long* msgtyp, int msgflg)
+inline int convert_mode(long* msgtyp, int msgflg)
 {
 	/* 
 	 *  find message of correct type.
diff -urN --exclude-from=/home/davej/.exclude linux/net/core/dev.c linux-dj/net/core/dev.c
--- linux/net/core/dev.c	Fri Mar  9 03:29:23 2001
+++ linux-dj/net/core/dev.c	Fri Mar  9 03:40:33 2001
@@ -1363,7 +1363,7 @@
 void (*br_handle_frame_hook)(struct sk_buff *skb) = NULL;
 #endif
 
-static int __inline__ handle_bridge(struct sk_buff *skb,
+static __inline__ int handle_bridge(struct sk_buff *skb,
 				     struct packet_type *pt_prev)
 {
 	int ret = NET_RX_DROP;