diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 18:02:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 18:02:00 +0000 |
| commit | 02f8110d6a247d53b489b29eec8a35c85e713c6b (patch) | |
| tree | 9cb65032a35c2d1af581deaac73dfa2540b2fbdd /include/asm-s390 | |
| parent | b62a3d8e8a9d02ff6f9103358b7a9c2c3d56c653 (diff) | |
Merge with Linux 2.4.0-test6-pre2.
Diffstat (limited to 'include/asm-s390')
| -rw-r--r-- | include/asm-s390/stat.h | 4 | ||||
| -rw-r--r-- | include/asm-s390/system.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-s390/stat.h b/include/asm-s390/stat.h index e3e5907e9..be52ef679 100644 --- a/include/asm-s390/stat.h +++ b/include/asm-s390/stat.h @@ -51,9 +51,9 @@ struct stat { */ struct stat64 { unsigned short st_dev; - unsigned char __pad0[10]; + unsigned char __pad0[6]; - unsigned long st_ino; + unsigned long long st_ino; unsigned int st_mode; unsigned int st_nlink; diff --git a/include/asm-s390/system.h b/include/asm-s390/system.h index 26910ac1f..afced6af1 100644 --- a/include/asm-s390/system.h +++ b/include/asm-s390/system.h @@ -117,7 +117,6 @@ static inline unsigned long __xchg(unsigned long x, void * ptr, int size) #define wmb() eieio() #define set_mb(var, value) do { var = value; mb(); } while (0) -#define set_rmb(var, value) do { var = value; rmb(); } while (0) #define set_wmb(var, value) do { var = value; wmb(); } while (0) /* interrupt control.. */ |