Commit 6d4b56a4 authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/home/mochel/BK/linux-2.5

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
parents d4b86e56 bd4370a0
...@@ -43,7 +43,7 @@ do { unsigned int *dest = &(__elf_regs[0]); \ ...@@ -43,7 +43,7 @@ do { unsigned int *dest = &(__elf_regs[0]); \
dest[34] = (unsigned int) src->tnpc; \ dest[34] = (unsigned int) src->tnpc; \
dest[35] = src->y; \ dest[35] = src->y; \
dest[36] = dest[37] = 0; /* XXX */ \ dest[36] = dest[37] = 0; /* XXX */ \
} while(0) } while(0);
typedef struct { typedef struct {
union { union {
......
...@@ -424,10 +424,10 @@ void flush_thread(void) ...@@ -424,10 +424,10 @@ void flush_thread(void)
struct thread_info *t = current_thread_info(); struct thread_info *t = current_thread_info();
if (t->task->mm) { if (t->task->mm) {
unsigned long pgd_cache = 0UL;
if (test_thread_flag(TIF_32BIT)) { if (test_thread_flag(TIF_32BIT)) {
struct mm_struct *mm = t->task->mm; struct mm_struct *mm = t->task->mm;
pgd_t *pgd0 = &mm->pgd[0]; pgd_t *pgd0 = &mm->pgd[0];
unsigned long pgd_cache;
if (pgd_none(*pgd0)) { if (pgd_none(*pgd0)) {
pmd_t *page = pmd_alloc_one_fast(NULL, 0); pmd_t *page = pmd_alloc_one_fast(NULL, 0);
...@@ -436,13 +436,13 @@ void flush_thread(void) ...@@ -436,13 +436,13 @@ void flush_thread(void)
pgd_set(pgd0, page); pgd_set(pgd0, page);
} }
pgd_cache = pgd_val(*pgd0) << 11UL; pgd_cache = pgd_val(*pgd0) << 11UL;
__asm__ __volatile__("stxa %0, [%1] %2\n\t"
"membar #Sync"
: /* no outputs */
: "r" (pgd_cache),
"r" (TSB_REG),
"i" (ASI_DMMU));
} }
__asm__ __volatile__("stxa %0, [%1] %2\n\t"
"membar #Sync"
: /* no outputs */
: "r" (pgd_cache),
"r" (TSB_REG),
"i" (ASI_DMMU));
} }
set_thread_wsaved(0); set_thread_wsaved(0);
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
*/ */
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/errno.h>
/* /*
* Atomically update sem->count. * Atomically update sem->count.
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/errno.h>
#include <asm/fpumacro.h> #include <asm/fpumacro.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/kmod.h> #include <linux/kmod.h>
#include <linux/slab.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/semaphore.h> #include <asm/semaphore.h>
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <linux/config.h> #include <linux/config.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/sched.h> #include <linux/sched.h>
......
...@@ -48,6 +48,8 @@ extern void flush_cache_range(struct vm_area_struct *, unsigned long, unsigned l ...@@ -48,6 +48,8 @@ extern void flush_cache_range(struct vm_area_struct *, unsigned long, unsigned l
flush_cache_mm((vma)->vm_mm) flush_cache_mm((vma)->vm_mm)
struct page;
/* /*
* On spitfire, the icache doesn't snoop local stores and we don't * On spitfire, the icache doesn't snoop local stores and we don't
* use block commit stores (which invalidate icache lines) during * use block commit stores (which invalidate icache lines) during
......
...@@ -589,7 +589,7 @@ static inline struct sk_buff *__skb_dequeue(struct sk_buff_head *list) ...@@ -589,7 +589,7 @@ static inline struct sk_buff *__skb_dequeue(struct sk_buff_head *list)
static inline struct sk_buff *skb_dequeue(struct sk_buff_head *list) static inline struct sk_buff *skb_dequeue(struct sk_buff_head *list)
{ {
long flags; unsigned long flags;
struct sk_buff *result; struct sk_buff *result;
spin_lock_irqsave(&list->lock, flags); spin_lock_irqsave(&list->lock, flags);
...@@ -738,7 +738,7 @@ static inline struct sk_buff *__skb_dequeue_tail(struct sk_buff_head *list) ...@@ -738,7 +738,7 @@ static inline struct sk_buff *__skb_dequeue_tail(struct sk_buff_head *list)
static inline struct sk_buff *skb_dequeue_tail(struct sk_buff_head *list) static inline struct sk_buff *skb_dequeue_tail(struct sk_buff_head *list)
{ {
long flags; unsigned long flags;
struct sk_buff *result; struct sk_buff *result;
spin_lock_irqsave(&list->lock, flags); spin_lock_irqsave(&list->lock, flags);
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
*/ */
#include <linux/timex.h> #include <linux/timex.h>
#include <linux/errno.h>
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment