diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-04 10:27:44 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-04 10:27:44 +0100 |
| commit | ba1b3afd50913473f3036a63b4a82d7ba5c42009 (patch) | |
| tree | 9dff0ddec4bf8b927a025b4bf9882cb1731170f3 /linux/dev/include/linux | |
| parent | bfdb3be16e5a20eebc97b3ca613d9a4da4465533 (diff) | |
| parent | 51e87d005139a435cd846ac5c224eed5042c4fa0 (diff) | |
Merge branch 'master' into master-gdb_stubs
Diffstat (limited to 'linux/dev/include/linux')
| -rw-r--r-- | linux/dev/include/linux/blk.h | 2 | ||||
| -rw-r--r-- | linux/dev/include/linux/kernel.h | 4 | ||||
| -rw-r--r-- | linux/dev/include/linux/notifier.h | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/linux/dev/include/linux/blk.h b/linux/dev/include/linux/blk.h index 852853c5..412b8641 100644 --- a/linux/dev/include/linux/blk.h +++ b/linux/dev/include/linux/blk.h @@ -385,7 +385,9 @@ static void end_request(int uptodate) { struct request *req = CURRENT; #endif /* IDE_DRIVER */ struct buffer_head * bh; +#ifndef MACH int nsect; +#endif req->errors = 0; if (!uptodate) { diff --git a/linux/dev/include/linux/kernel.h b/linux/dev/include/linux/kernel.h index aef73ac3..4db76acc 100644 --- a/linux/dev/include/linux/kernel.h +++ b/linux/dev/include/linux/kernel.h @@ -9,9 +9,7 @@ #include <stdarg.h> #include <linux/linkage.h> - -/* Optimization barrier */ -#define barrier() __asm__("": : :"memory") +#include <linux/compiler.h> #define INT_MAX ((int)(~0U>>1)) #define UINT_MAX (~0U) diff --git a/linux/dev/include/linux/notifier.h b/linux/dev/include/linux/notifier.h index eede20f0..b3c9ccf6 100644 --- a/linux/dev/include/linux/notifier.h +++ b/linux/dev/include/linux/notifier.h @@ -55,11 +55,7 @@ extern __inline__ int notifier_chain_unregister(struct notifier_block **nl, stru } nl=&((*nl)->next); } -#ifdef MACH_INCLUDE - return -LINUX_ENOENT; -#else return -ENOENT; -#endif } /* |