ia64/xen-unstable

changeset 3342:a5ec6d0d2e4c

bitkeeper revision 1.1159.1.511 (41d2d24csvxPmAj9ZQPfm1CsFAsulA)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Wed Dec 29 15:50:36 2004 +0000 (2004-12-29)
parents e8043ed6d8d5 1c1c7c231198
children a19c7e2a1238 b3b0139a17e0
files xen/include/xen/init.h
line diff
     1.1 --- a/xen/include/xen/init.h	Wed Dec 29 15:25:42 2004 +0000
     1.2 +++ b/xen/include/xen/init.h	Wed Dec 29 15:50:36 2004 +0000
     1.3 @@ -78,7 +78,8 @@ extern struct kernel_param __setup_start
     1.4      static struct kernel_param __setup_##_var __attribute_used__ \
     1.5          __initsetup = { __setup_str_##_var, OPT_STR, &_var, sizeof(_var) }
     1.6  
     1.7 -#define __setup(_name, _fn)
     1.8 +/* Make sure obsolete cmdline params don't break the build. */
     1.9 +#define __setup(_name, _fn) static void * __attribute_used__ _dummy_##_fn = _fn
    1.10      
    1.11  #endif /* __ASSEMBLY__ */
    1.12