diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-04 03:30:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-04 03:30:42 -0700 |
| commit | ea1e2d6259e83d6fae83473f7b90a683ec770322 (patch) | |
| tree | 943365f62bdd3834636859d634736b90fb029329 /include | |
| parent | 5fb4864a07e35858285ec886fcaa187094a1be15 (diff) | |
| parent | 095205245221d453bf47d25261581af0c3735a18 (diff) | |
Merge bk://bk.arm.linux.org.uk
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/mach/map.h | 18 | ||||
| -rw-r--r-- | include/asm-arm/page.h | 4 | ||||
| -rw-r--r-- | include/asm-arm/thread_info.h | 6 |
3 files changed, 14 insertions, 14 deletions
diff --git a/include/asm-arm/mach/map.h b/include/asm-arm/mach/map.h index 51fef86d2406..284df8bb76d1 100644 --- a/include/asm-arm/mach/map.h +++ b/include/asm-arm/mach/map.h @@ -13,20 +13,18 @@ struct map_desc { unsigned long virtual; unsigned long physical; unsigned long length; - int domain:4, - prot_read:1, - prot_write:1, - cacheable:1, - bufferable:1, - last:1; + unsigned int type; }; -#define LAST_DESC \ - { last: 1 } - struct meminfo; +#define MT_DEVICE 0 +#define MT_CACHECLEAN 1 +#define MT_MINICLEAN 2 +#define MT_VECTORS 3 +#define MT_MEMORY 4 + extern void create_memmap_holes(struct meminfo *); extern void memtable_init(struct meminfo *); -extern void iotable_init(struct map_desc *); +extern void iotable_init(struct map_desc *, int); extern void setup_io_desc(void); diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h index 6f8afed589ac..84b1f5970586 100644 --- a/include/asm-arm/page.h +++ b/include/asm-arm/page.h @@ -30,14 +30,14 @@ extern void __cpu_copy_user_page(void *to, const void *from, unsigned long user); #endif -#define clear_user_page(addr,vaddr) \ +#define clear_user_page(addr,vaddr,pg) \ do { \ preempt_disable(); \ __cpu_clear_user_page(addr, vaddr); \ preempt_enable(); \ } while (0) -#define copy_user_page(to,from,vaddr) \ +#define copy_user_page(to,from,vaddr,pg) \ do { \ preempt_disable(); \ __cpu_copy_user_page(to, from, vaddr); \ diff --git a/include/asm-arm/thread_info.h b/include/asm-arm/thread_info.h index ebed4a570599..1991b807b3ce 100644 --- a/include/asm-arm/thread_info.h +++ b/include/asm-arm/thread_info.h @@ -86,8 +86,10 @@ extern void free_thread_info(struct thread_info *); #define get_thread_info(ti) get_task_struct((ti)->task) #define put_thread_info(ti) put_task_struct((ti)->task) -#define thread_saved_pc(tsk) (pc_pointer((tsk)->thread_info->cpu_context.pc)) -#define thread_saved_fp(tsk) ((tsk)->thread_info->cpu_context.fp) +#define thread_saved_pc(tsk) \ + ((unsigned long)(pc_pointer((tsk)->thread_info->cpu_context.pc))) +#define thread_saved_fp(tsk) \ + ((unsigned long)((tsk)->thread_info->cpu_context.fp)) #else /* !__ASSEMBLY__ */ |