diff options
| author | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2003-12-19 14:38:15 +0000 |
|---|---|---|
| committer | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2003-12-19 14:38:15 +0000 |
| commit | 24e81789606925507a369a624941c7bbab793735 (patch) | |
| tree | 4f9b3c3bcafc3357a3ec41fd071742e69bceb1b6 /xenolinux-2.4.22-sparse/kernel/printk.c | |
| parent | 49836d9d4f67e92796cf8d68ad4361b448bd7d9d (diff) | |
| parent | 8708081a01a064f8356f580445cc57f6aa2b9648 (diff) | |
| download | xen-24e81789606925507a369a624941c7bbab793735.tar.gz xen-24e81789606925507a369a624941c7bbab793735.tar.bz2 xen-24e81789606925507a369a624941c7bbab793735.zip | |
bitkeeper revision 1.651 (3fe30d57DatlAZVUHwbVCkF4_TelxA)
Merge labyrinth.cl.cam.ac.uk:/usr/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk
Diffstat (limited to 'xenolinux-2.4.22-sparse/kernel/printk.c')
| -rw-r--r-- | xenolinux-2.4.22-sparse/kernel/printk.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xenolinux-2.4.22-sparse/kernel/printk.c b/xenolinux-2.4.22-sparse/kernel/printk.c index 5564fccf5d..6cfedd9c02 100644 --- a/xenolinux-2.4.22-sparse/kernel/printk.c +++ b/xenolinux-2.4.22-sparse/kernel/printk.c @@ -29,6 +29,7 @@ #include <asm/uaccess.h> +#if !defined(CONFIG_LOG_BUF_SHIFT) || (CONFIG_LOG_BUF_SHIFT == 0) #if defined(CONFIG_MULTIQUAD) || defined(CONFIG_IA64) #define LOG_BUF_LEN (65536) #elif defined(CONFIG_ARCH_S390) @@ -38,6 +39,9 @@ #else #define LOG_BUF_LEN (16384) /* This must be a power of two */ #endif +#else /* CONFIG_LOG_BUF_SHIFT */ +#define LOG_BUF_LEN (1 << CONFIG_LOG_BUF_SHIFT) +#endif #define LOG_BUF_MASK (LOG_BUF_LEN-1) |