aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJames Bottomley <jejb@titanic>2005-04-18 21:55:09 -0400
committerJames Bottomley <jejb@titanic>2005-04-18 21:55:09 -0400
commitc0698f2f6e4839ce9463ce731c892993215ea067 (patch)
treeb05fc8a950ace937460212e996441e4c05a227f6 /include
parentcb624029cab62e5415287d15b2ec907b8f322ff5 (diff)
parent7f907d7486f2519c2ff1493bfbcdc36dcacd85b7 (diff)
fully merge up to scsi-misc-2.6
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/arch-ebsa285/debug-macro.S7
-rw-r--r--include/asm-arm/arch-rpc/debug-macro.S5
-rw-r--r--include/asm-arm/ptrace.h5
-rw-r--r--include/asm-arm/system.h3
-rw-r--r--include/asm-sparc/unistd.h6
-rw-r--r--include/asm-sparc64/cacheflush.h22
-rw-r--r--include/asm-sparc64/compat.h40
-rw-r--r--include/asm-sparc64/stat.h49
-rw-r--r--include/asm-sparc64/unistd.h6
9 files changed, 87 insertions, 56 deletions
diff --git a/include/asm-arm/arch-ebsa285/debug-macro.S b/include/asm-arm/arch-ebsa285/debug-macro.S
index 237853db6e2f..97d15fc629af 100644
--- a/include/asm-arm/arch-ebsa285/debug-macro.S
+++ b/include/asm-arm/arch-ebsa285/debug-macro.S
@@ -45,9 +45,12 @@
45 .equ dc21285_low, ARMCSR_BASE & 0x00ffffff 45 .equ dc21285_low, ARMCSR_BASE & 0x00ffffff
46 46
47 .macro addruart,rx 47 .macro addruart,rx
48 mov \rx, #dc21285_high 48 mrc p15, 0, \rx, c1, c0
49 tst \rx, #1 @ MMU enabled?
50 moveq \rx, #0x42000000
51 movne \rx, #dc21285_high
49 .if dc21285_low 52 .if dc21285_low
50 orr \rx, \rx, #dc21285_low 53 orrne \rx, \rx, #dc21285_low
51 .endif 54 .endif
52 .endm 55 .endm
53 56
diff --git a/include/asm-arm/arch-rpc/debug-macro.S b/include/asm-arm/arch-rpc/debug-macro.S
index 0711828164cd..456d3d754c3d 100644
--- a/include/asm-arm/arch-rpc/debug-macro.S
+++ b/include/asm-arm/arch-rpc/debug-macro.S
@@ -12,7 +12,10 @@
12*/ 12*/
13 13
14 .macro addruart,rx 14 .macro addruart,rx
15 mov \rx, #0xe0000000 15 mrc p15, 0, \rx, c1, c0
16 tst \rx, #1 @ MMU enabled?
17 moveq \rx, #0x03000000
18 movne \rx, #0xe0000000
16 orr \rx, \rx, #0x00010000 19 orr \rx, \rx, #0x00010000
17 orr \rx, \rx, #0x00000fe0 20 orr \rx, \rx, #0x00000fe0
18 .endm 21 .endm
diff --git a/include/asm-arm/ptrace.h b/include/asm-arm/ptrace.h
index 604e3a186cf9..4377e22b7e1a 100644
--- a/include/asm-arm/ptrace.h
+++ b/include/asm-arm/ptrace.h
@@ -142,11 +142,8 @@ extern unsigned long profile_pc(struct pt_regs *regs);
142#endif 142#endif
143 143
144#ifdef __KERNEL__ 144#ifdef __KERNEL__
145extern void show_regs(struct pt_regs *); 145#define predicate(x) ((x) & 0xf0000000)
146
147#define predicate(x) (x & 0xf0000000)
148#define PREDICATE_ALWAYS 0xe0000000 146#define PREDICATE_ALWAYS 0xe0000000
149
150#endif 147#endif
151 148
152#endif /* __ASSEMBLY__ */ 149#endif /* __ASSEMBLY__ */
diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h
index b5731290b4e5..b13a8da4847b 100644
--- a/include/asm-arm/system.h
+++ b/include/asm-arm/system.h
@@ -99,6 +99,9 @@ void hook_fault_code(int nr, int (*fn)(unsigned long, unsigned int,
99#define tas(ptr) (xchg((ptr),1)) 99#define tas(ptr) (xchg((ptr),1))
100 100
101extern asmlinkage void __backtrace(void); 101extern asmlinkage void __backtrace(void);
102extern asmlinkage void c_backtrace(unsigned long fp, int pmode);
103extern void show_pte(struct mm_struct *mm, unsigned long addr);
104extern void __show_regs(struct pt_regs *);
102 105
103extern int cpu_architecture(void); 106extern int cpu_architecture(void);
104 107
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h
index d1f63caaa326..846708403900 100644
--- a/include/asm-sparc/unistd.h
+++ b/include/asm-sparc/unistd.h
@@ -79,7 +79,7 @@
79#define __NR_umask 60 /* Common */ 79#define __NR_umask 60 /* Common */
80#define __NR_chroot 61 /* Common */ 80#define __NR_chroot 61 /* Common */
81#define __NR_fstat 62 /* Common */ 81#define __NR_fstat 62 /* Common */
82#define __NR_fstat64 63 /* Linux sparc32 Specific */ 82#define __NR_fstat64 63 /* Linux Specific */
83#define __NR_getpagesize 64 /* Common */ 83#define __NR_getpagesize 64 /* Common */
84#define __NR_msync 65 /* Common in newer 1.3.x revs... */ 84#define __NR_msync 65 /* Common in newer 1.3.x revs... */
85#define __NR_vfork 66 /* Common */ 85#define __NR_vfork 66 /* Common */
@@ -148,14 +148,14 @@
148#define __NR_truncate 129 /* Common */ 148#define __NR_truncate 129 /* Common */
149#define __NR_ftruncate 130 /* Common */ 149#define __NR_ftruncate 130 /* Common */
150#define __NR_flock 131 /* Common */ 150#define __NR_flock 131 /* Common */
151#define __NR_lstat64 132 /* Linux sparc32 Specific */ 151#define __NR_lstat64 132 /* Linux Specific */
152#define __NR_sendto 133 /* Common */ 152#define __NR_sendto 133 /* Common */
153#define __NR_shutdown 134 /* Common */ 153#define __NR_shutdown 134 /* Common */
154#define __NR_socketpair 135 /* Common */ 154#define __NR_socketpair 135 /* Common */
155#define __NR_mkdir 136 /* Common */ 155#define __NR_mkdir 136 /* Common */
156#define __NR_rmdir 137 /* Common */ 156#define __NR_rmdir 137 /* Common */
157#define __NR_utimes 138 /* SunOS Specific */ 157#define __NR_utimes 138 /* SunOS Specific */
158#define __NR_stat64 139 /* Linux sparc32 Specific */ 158#define __NR_stat64 139 /* Linux Specific */
159#define __NR_sendfile64 140 /* adjtime under SunOS */ 159#define __NR_sendfile64 140 /* adjtime under SunOS */
160#define __NR_getpeername 141 /* Common */ 160#define __NR_getpeername 141 /* Common */
161#define __NR_futex 142 /* gethostid under SunOS */ 161#define __NR_futex 142 /* gethostid under SunOS */
diff --git a/include/asm-sparc64/cacheflush.h b/include/asm-sparc64/cacheflush.h
index 86f02937ff1b..51b26e81d828 100644
--- a/include/asm-sparc64/cacheflush.h
+++ b/include/asm-sparc64/cacheflush.h
@@ -49,16 +49,22 @@ extern void flush_dcache_page(struct page *page);
49#define flush_icache_page(vma, pg) do { } while(0) 49#define flush_icache_page(vma, pg) do { } while(0)
50#define flush_icache_user_range(vma,pg,adr,len) do { } while (0) 50#define flush_icache_user_range(vma,pg,adr,len) do { } while (0)
51 51
52#define copy_to_user_page(vma, page, vaddr, dst, src, len) \ 52extern void flush_ptrace_access(struct vm_area_struct *, struct page *,
53 do { \ 53 unsigned long uaddr, void *kaddr,
54 flush_cache_page(vma, vaddr, page_to_pfn(page));\ 54 unsigned long len, int write);
55 memcpy(dst, src, len); \ 55
56#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
57 do { \
58 flush_cache_page(vma, vaddr, page_to_pfn(page)); \
59 memcpy(dst, src, len); \
60 flush_ptrace_access(vma, page, vaddr, src, len, 0); \
56 } while (0) 61 } while (0)
57 62
58#define copy_from_user_page(vma, page, vaddr, dst, src, len) \ 63#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
59 do { \ 64 do { \
60 flush_cache_page(vma, vaddr, page_to_pfn(page));\ 65 flush_cache_page(vma, vaddr, page_to_pfn(page)); \
61 memcpy(dst, src, len); \ 66 memcpy(dst, src, len); \
67 flush_ptrace_access(vma, page, vaddr, dst, len, 1); \
62 } while (0) 68 } while (0)
63 69
64#define flush_dcache_mmap_lock(mapping) do { } while (0) 70#define flush_dcache_mmap_lock(mapping) do { } while (0)
diff --git a/include/asm-sparc64/compat.h b/include/asm-sparc64/compat.h
index 2950279dd776..22f58055b8ab 100644
--- a/include/asm-sparc64/compat.h
+++ b/include/asm-sparc64/compat.h
@@ -51,16 +51,50 @@ struct compat_stat {
51 compat_dev_t st_rdev; 51 compat_dev_t st_rdev;
52 compat_off_t st_size; 52 compat_off_t st_size;
53 compat_time_t st_atime; 53 compat_time_t st_atime;
54 u32 __unused1; 54 compat_ulong_t st_atime_nsec;
55 compat_time_t st_mtime; 55 compat_time_t st_mtime;
56 u32 __unused2; 56 compat_ulong_t st_mtime_nsec;
57 compat_time_t st_ctime; 57 compat_time_t st_ctime;
58 u32 __unused3; 58 compat_ulong_t st_ctime_nsec;
59 compat_off_t st_blksize; 59 compat_off_t st_blksize;
60 compat_off_t st_blocks; 60 compat_off_t st_blocks;
61 u32 __unused4[2]; 61 u32 __unused4[2];
62}; 62};
63 63
64struct compat_stat64 {
65 unsigned long long st_dev;
66
67 unsigned long long st_ino;
68
69 unsigned int st_mode;
70 unsigned int st_nlink;
71
72 unsigned int st_uid;
73 unsigned int st_gid;
74
75 unsigned long long st_rdev;
76
77 unsigned char __pad3[8];
78
79 long long st_size;
80 unsigned int st_blksize;
81
82 unsigned char __pad4[8];
83 unsigned int st_blocks;
84
85 unsigned int st_atime;
86 unsigned int st_atime_nsec;
87
88 unsigned int st_mtime;
89 unsigned int st_mtime_nsec;
90
91 unsigned int st_ctime;
92 unsigned int st_ctime_nsec;
93
94 unsigned int __unused4;
95 unsigned int __unused5;
96};
97
64struct compat_flock { 98struct compat_flock {
65 short l_type; 99 short l_type;
66 short l_whence; 100 short l_whence;
diff --git a/include/asm-sparc64/stat.h b/include/asm-sparc64/stat.h
index 48e06618a5a4..128c27e57f0b 100644
--- a/include/asm-sparc64/stat.h
+++ b/include/asm-sparc64/stat.h
@@ -21,43 +21,28 @@ struct stat {
21 unsigned long __unused4[2]; 21 unsigned long __unused4[2];
22}; 22};
23 23
24#ifdef __KERNEL__
25/* This is sparc32 stat64 structure. */
26
27struct stat64 { 24struct stat64 {
28 unsigned long long st_dev; 25 unsigned long st_dev;
29 26 unsigned long st_ino;
30 unsigned long long st_ino; 27 unsigned long st_nlink;
31 28
32 unsigned int st_mode; 29 unsigned int st_mode;
33 unsigned int st_nlink;
34
35 unsigned int st_uid; 30 unsigned int st_uid;
36 unsigned int st_gid; 31 unsigned int st_gid;
37 32 unsigned int __pad0;
38 unsigned long long st_rdev; 33
39 34 unsigned long st_rdev;
40 unsigned char __pad3[8]; 35 long st_size;
41 36 long st_blksize;
42 long long st_size; 37 long st_blocks;
43 unsigned int st_blksize; 38
44 39 unsigned long st_atime;
45 unsigned char __pad4[8]; 40 unsigned long st_atime_nsec;
46 unsigned int st_blocks; 41 unsigned long st_mtime;
47 42 unsigned long st_mtime_nsec;
48 unsigned int st_atime; 43 unsigned long st_ctime;
49 unsigned int st_atime_nsec; 44 unsigned long st_ctime_nsec;
50 45 long __unused[3];
51 unsigned int st_mtime;
52 unsigned int st_mtime_nsec;
53
54 unsigned int st_ctime;
55 unsigned int st_ctime_nsec;
56
57 unsigned int __unused4;
58 unsigned int __unused5;
59}; 46};
60 47
61#endif 48#endif
62
63#endif
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h
index 3c00065eea80..5b8dcf5786a5 100644
--- a/include/asm-sparc64/unistd.h
+++ b/include/asm-sparc64/unistd.h
@@ -79,7 +79,7 @@
79#define __NR_umask 60 /* Common */ 79#define __NR_umask 60 /* Common */
80#define __NR_chroot 61 /* Common */ 80#define __NR_chroot 61 /* Common */
81#define __NR_fstat 62 /* Common */ 81#define __NR_fstat 62 /* Common */
82/* #define __NR_fstat64 63 Linux sparc32 Specific */ 82#define __NR_fstat64 63 /* Linux Specific */
83#define __NR_getpagesize 64 /* Common */ 83#define __NR_getpagesize 64 /* Common */
84#define __NR_msync 65 /* Common in newer 1.3.x revs... */ 84#define __NR_msync 65 /* Common in newer 1.3.x revs... */
85#define __NR_vfork 66 /* Common */ 85#define __NR_vfork 66 /* Common */
@@ -148,14 +148,14 @@
148#define __NR_truncate 129 /* Common */ 148#define __NR_truncate 129 /* Common */
149#define __NR_ftruncate 130 /* Common */ 149#define __NR_ftruncate 130 /* Common */
150#define __NR_flock 131 /* Common */ 150#define __NR_flock 131 /* Common */
151/* #define __NR_lstat64 132 Linux sparc32 Specific */ 151#define __NR_lstat64 132 /* Linux Specific */
152#define __NR_sendto 133 /* Common */ 152#define __NR_sendto 133 /* Common */
153#define __NR_shutdown 134 /* Common */ 153#define __NR_shutdown 134 /* Common */
154#define __NR_socketpair 135 /* Common */ 154#define __NR_socketpair 135 /* Common */
155#define __NR_mkdir 136 /* Common */ 155#define __NR_mkdir 136 /* Common */
156#define __NR_rmdir 137 /* Common */ 156#define __NR_rmdir 137 /* Common */
157#define __NR_utimes 138 /* SunOS Specific */ 157#define __NR_utimes 138 /* SunOS Specific */
158/* #define __NR_stat64 139 Linux sparc32 Specific */ 158#define __NR_stat64 139 /* Linux Specific */
159#define __NR_sendfile64 140 /* adjtime under SunOS */ 159#define __NR_sendfile64 140 /* adjtime under SunOS */
160#define __NR_getpeername 141 /* Common */ 160#define __NR_getpeername 141 /* Common */
161#define __NR_futex 142 /* gethostid under SunOS */ 161#define __NR_futex 142 /* gethostid under SunOS */
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-07 05:22:16 -0500