diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-12 07:48:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-12 07:48:57 -0500 |
| commit | 45ab6b0c76d0e4cce5bd608ccf97b0f6b20f18df (patch) | |
| tree | 4d51c73533c386aee16fde1e74b5e3bc22eedc53 /include/linux/blkdev.h | |
| parent | 81444a799550214f549caf579cf65a0ca55e70b7 (diff) | |
| parent | d65bd5ecb2bd166cea4952a59b7e16cc3ad6ef6c (diff) | |
Merge branch 'sched/core' into cpus4096
Conflicts:
include/linux/ftrace.h
kernel/sched.c
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 6dcd30d806cd..031a315c0509 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -662,6 +662,7 @@ extern unsigned long blk_max_low_pfn, blk_max_pfn; | |||
| 662 | * default timeout for SG_IO if none specified | 662 | * default timeout for SG_IO if none specified |
| 663 | */ | 663 | */ |
| 664 | #define BLK_DEFAULT_SG_TIMEOUT (60 * HZ) | 664 | #define BLK_DEFAULT_SG_TIMEOUT (60 * HZ) |
| 665 | #define BLK_MIN_SG_TIMEOUT (7 * HZ) | ||
| 665 | 666 | ||
| 666 | #ifdef CONFIG_BOUNCE | 667 | #ifdef CONFIG_BOUNCE |
| 667 | extern int init_emergency_isa_pool(void); | 668 | extern int init_emergency_isa_pool(void); |