diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:13:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:13:52 -0800 |
| commit | ed6eefe4382ab3a72d70922d401b7c8003513f13 (patch) | |
| tree | 02530a3e9ad5144240f04d6455f9c0184b72132c /include/asm-alpha | |
| parent | 24579a8815132babf322c6d73608ce31f9b28ac8 (diff) | |
v2.4.3.6 -> v2.4.3.7
- Johannes Erdfelt: USB updates
- David Howells: more rw-sem stuff
- David Miller: network callback cleanups and fixes
- Jan Harkes: make Coda use the proper VFS layer interfaces, so that it can use
"non-traditional-unix" filesystems without inode numbers for backing store.
Diffstat (limited to 'include/asm-alpha')
| -rw-r--r-- | include/asm-alpha/compiler.h | 9 | ||||
| -rw-r--r-- | include/asm-alpha/pgalloc.h | 2 | ||||
| -rw-r--r-- | include/asm-alpha/semaphore.h | 2 |
3 files changed, 2 insertions, 11 deletions
diff --git a/include/asm-alpha/compiler.h b/include/asm-alpha/compiler.h index 7714bf2df308..70d6ce7750dc 100644 --- a/include/asm-alpha/compiler.h +++ b/include/asm-alpha/compiler.h @@ -72,13 +72,4 @@ __asm__("stw %1,%0" : "=m"(mem) : "r"(val)) #endif -/* Somewhere in the middle of the GCC 2.96 development cycle, we implemented - a mechanism by which the user can annotate likely branch directions and - expect the blocks to be reordered appropriately. Define __builtin_expect - to nothing for earlier compilers. */ - -#if __GNUC__ == 2 && __GNUC_MINOR__ < 96 -#define __builtin_expect(x, expected_value) (x) -#endif - #endif /* __ALPHA_COMPILER_H */ diff --git a/include/asm-alpha/pgalloc.h b/include/asm-alpha/pgalloc.h index 3ab3874d6ed8..5b26f301643e 100644 --- a/include/asm-alpha/pgalloc.h +++ b/include/asm-alpha/pgalloc.h @@ -338,7 +338,7 @@ static inline void pte_free_slow(pte_t *pte) #define pte_free(pte) pte_free_fast(pte) #define pmd_free(pmd) pmd_free_fast(pmd) #define pgd_free(pgd) free_pgd_fast(pgd) -#define pgd_alloc() get_pgd_fast() +#define pgd_alloc(mm) get_pgd_fast() extern int do_check_pgt_cache(int, int); diff --git a/include/asm-alpha/semaphore.h b/include/asm-alpha/semaphore.h index 635c5c9a6582..b5d6082085c1 100644 --- a/include/asm-alpha/semaphore.h +++ b/include/asm-alpha/semaphore.h @@ -11,7 +11,7 @@ #include <asm/current.h> #include <asm/system.h> #include <asm/atomic.h> -#include <asm/compiler.h> /* __builtin_expect */ +#include <linux/compiler.h> #include <linux/wait.h> #include <linux/rwsem.h> |