diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /include/linux/quicklist.h | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'include/linux/quicklist.h')
| -rw-r--r-- | include/linux/quicklist.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/quicklist.h b/include/linux/quicklist.h index 39b66713a0bb..bd466439c588 100644 --- a/include/linux/quicklist.h +++ b/include/linux/quicklist.h | |||
| @@ -80,6 +80,13 @@ void quicklist_trim(int nr, void (*dtor)(void *), | |||
| 80 | 80 | ||
| 81 | unsigned long quicklist_total_size(void); | 81 | unsigned long quicklist_total_size(void); |
| 82 | 82 | ||
| 83 | #else | ||
| 84 | |||
| 85 | static inline unsigned long quicklist_total_size(void) | ||
| 86 | { | ||
| 87 | return 0; | ||
| 88 | } | ||
| 89 | |||
| 83 | #endif | 90 | #endif |
| 84 | 91 | ||
| 85 | #endif /* LINUX_QUICKLIST_H */ | 92 | #endif /* LINUX_QUICKLIST_H */ |