diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-21 22:34:01 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-21 22:34:01 +0000 |
commit | 9e30c3705aed9fbec4c3304570e4d6e707856bcb (patch) | |
tree | b19e6acb5a67af31a4e7742e05c2166dc3f1444c /include/asm-alpha | |
parent | 72919904796333a20c6a5d5c380091b42e407aa9 (diff) |
Merge with Linux 2.3.22.
Diffstat (limited to 'include/asm-alpha')
-rw-r--r-- | include/asm-alpha/pgtable.h | 2 | ||||
-rw-r--r-- | include/asm-alpha/processor.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-alpha/pgtable.h b/include/asm-alpha/pgtable.h index 004924b93..cc59d36df 100644 --- a/include/asm-alpha/pgtable.h +++ b/include/asm-alpha/pgtable.h @@ -622,6 +622,6 @@ extern inline pte_t mk_swap_pte(unsigned long type, unsigned long offset) #define kern_addr_valid(addr) (1) #define io_remap_page_range(start, busaddr, size, prot) \ - remap_page_range(start, virt_to_phys(ioremap(busaddr)), size, prot) + remap_page_range(start, virt_to_phys(__ioremap(busaddr)), size, prot) #endif /* _ALPHA_PGTABLE_H */ diff --git a/include/asm-alpha/processor.h b/include/asm-alpha/processor.h index 0c5163433..92654cd83 100644 --- a/include/asm-alpha/processor.h +++ b/include/asm-alpha/processor.h @@ -114,6 +114,8 @@ extern inline unsigned long thread_saved_pc(struct thread_struct *t) /* Do necessary setup to start up a newly executed thread. */ extern void start_thread(struct pt_regs *, unsigned long, unsigned long); +struct task_struct; + /* Free all resources held by a thread. */ extern void release_thread(struct task_struct *); |