diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-12-08 01:58:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-12-08 01:58:08 -0800 |
| commit | 9c83775c9b00ba74469f356573a5166f0f36a3b0 (patch) | |
| tree | aeaea51465defbf79006ad49c139751442215faf /include | |
| parent | 260aae1bd2459a166851ce3f886e2af5cf8f4175 (diff) | |
| parent | 81c3f87d038ce381187f7d78c1f6865a48960f3d (diff) | |
Merge bk://kernel.bkbits.net/acme/misc-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/desc.h | 3 | ||||
| -rw-r--r-- | include/asm-i386/mmu.h | 1 | ||||
| -rw-r--r-- | include/asm-i386/uaccess.h | 2 | ||||
| -rw-r--r-- | include/linux/if_wanpipe_common.h | 2 | ||||
| -rw-r--r-- | include/linux/wanpipe.h | 2 |
5 files changed, 7 insertions, 3 deletions
diff --git a/include/asm-i386/desc.h b/include/asm-i386/desc.h index 1c2ef24540e7..77f2b1c0ec46 100644 --- a/include/asm-i386/desc.h +++ b/include/asm-i386/desc.h @@ -6,6 +6,9 @@ #ifndef __ASSEMBLY__ +#include <linux/preempt.h> +#include <linux/smp.h> + #include <asm/mmu.h> extern struct desc_struct cpu_gdt_table[NR_CPUS][GDT_ENTRIES]; diff --git a/include/asm-i386/mmu.h b/include/asm-i386/mmu.h index 86d1064f6988..f431a0b86d4c 100644 --- a/include/asm-i386/mmu.h +++ b/include/asm-i386/mmu.h @@ -1,6 +1,7 @@ #ifndef __i386_MMU_H #define __i386_MMU_H +#include <asm/semaphore.h> /* * The i386 doesn't have a mmu context, but * we put the segment information here. diff --git a/include/asm-i386/uaccess.h b/include/asm-i386/uaccess.h index 15d367991bf8..05bdac770eed 100644 --- a/include/asm-i386/uaccess.h +++ b/include/asm-i386/uaccess.h @@ -6,7 +6,7 @@ */ #include <linux/config.h> #include <linux/errno.h> -#include <linux/sched.h> +#include <linux/thread_info.h> #include <linux/prefetch.h> #include <asm/page.h> diff --git a/include/linux/if_wanpipe_common.h b/include/linux/if_wanpipe_common.h index a5cab08d6990..28fefe071078 100644 --- a/include/linux/if_wanpipe_common.h +++ b/include/linux/if_wanpipe_common.h @@ -33,7 +33,7 @@ typedef struct { atomic_t command; atomic_t disconnect; atomic_t driver_busy; - unsigned char common_critical; + long common_critical; struct timer_list *tx_timer; struct sock *sk; /* Wanpipe Sock bind's here */ int (*func) (struct sk_buff *, netdevice_t *, diff --git a/include/linux/wanpipe.h b/include/linux/wanpipe.h index 74b35ec9099c..cbb0df8bf700 100644 --- a/include/linux/wanpipe.h +++ b/include/linux/wanpipe.h @@ -358,7 +358,7 @@ typedef struct sdla char in_isr; /* interrupt-in-service flag */ char buff_int_mode_unbusy; /* flag for carrying out dev_tint */ char dlci_int_mode_unbusy; /* flag for carrying out dev_tint */ - char configured; /* flag for previous configurations */ + long configured; /* flag for previous configurations */ unsigned short irq_dis_if_send_count; /* Disabling irqs in if_send*/ unsigned short irq_dis_poll_count; /* Disabling irqs in poll routine*/ |