diff options
Diffstat (limited to 'xenolinux-2.4.21-pre4-sparse/include/asm-xeno')
| -rw-r--r-- | xenolinux-2.4.21-pre4-sparse/include/asm-xeno/fixmap.h | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/xenolinux-2.4.21-pre4-sparse/include/asm-xeno/fixmap.h b/xenolinux-2.4.21-pre4-sparse/include/asm-xeno/fixmap.h index 0945783047..eee16cb240 100644 --- a/xenolinux-2.4.21-pre4-sparse/include/asm-xeno/fixmap.h +++ b/xenolinux-2.4.21-pre4-sparse/include/asm-xeno/fixmap.h @@ -43,6 +43,10 @@ enum fixed_addresses { FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1, #endif FIX_BLKRING_BASE, + FIX_NETRING0_BASE, + FIX_NETRING1_BASE, + FIX_NETRING2_BASE, + FIX_NETRING3_BASE, __end_of_permanent_fixed_addresses, __end_of_fixed_addresses }; @@ -70,27 +74,13 @@ extern void __set_fixmap (enum fixed_addresses idx, #define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT)) -extern void __this_fixmap_does_not_exist(void); - /* * 'index to address' translation. If anyone tries to use the idx * directly without tranlation, we catch the bug with a NULL-deference * kernel oops. Illegal ranges of incoming indices are caught too. */ -static inline unsigned long fix_to_virt(const unsigned int idx) +static inline unsigned long fix_to_virt(unsigned int idx) { - /* - * this branch gets completely eliminated after inlining, - * except when someone tries to use fixaddr indices in an - * illegal way. (such as mixing up address types or using - * out-of-range indices). - * - * If it doesn't get removed, the linker will complain - * loudly with a reasonably clear error message.. - */ - if (idx >= __end_of_fixed_addresses) - __this_fixmap_does_not_exist(); - return __fix_to_virt(idx); } |