lustre/kernel_patches/patches/header_guards-vanilla-2.6.patch

   1 %diffstat
   2  blockgroup_lock.h |    4 +++-
   3  percpu_counter.h  |    4 ++++
   4  2 files changed, 7 insertions(+), 1 deletion(-)
   5
   6 %patch
   7 Index: linux-2.6.6/include/linux/percpu_counter.h
   8 ===================================================================
   9 --- linux-2.6.6.orig/include/linux/percpu_counter.h     2004-04-04 11:37:23.000000000 +0800
  10 +++ linux-2.6.6/include/linux/percpu_counter.h  2004-05-22 16:08:16.000000000 +0800
  11 @@ -3,6 +3,8 @@
  12   *
  13   * WARNING: these things are HUGE.  4 kbytes per counter on 32-way P4.
  14   */
  15 +#ifndef _LINUX_PERCPU_COUNTER_H
  16 +#define _LINUX_PERCPU_COUNTER_H
  17
  18  #include <linux/config.h>
  19  #include <linux/spinlock.h>
  20 @@ -101,3 +103,5 @@ static inline void percpu_counter_dec(st
  21  {
  22         percpu_counter_mod(fbc, -1);
  23  }
  24 +
  25 +#endif /* _LINUX_PERCPU_COUNTER_H */
  26 Index: linux-2.6.6/include/linux/blockgroup_lock.h
  27 ===================================================================
  28 --- linux-2.6.6.orig/include/linux/blockgroup_lock.h    2004-04-04 11:36:26.000000000 +0800
  29 +++ linux-2.6.6/include/linux/blockgroup_lock.h 2004-05-22 16:08:45.000000000 +0800
  30 @@ -3,6 +3,8 @@
  31   *
  32   * Simple hashed spinlocking.
  33   */
  34 +#ifndef _LINUX_BLOCKGROUP_LOCK_H
  35 +#define _LINUX_BLOCKGROUP_LOCK_H
  36
  37  #include <linux/config.h>
  38  #include <linux/spinlock.h>
  39 @@ -55,4 +57,4 @@ static inline void bgl_lock_init(struct
  40  #define sb_bgl_lock(sb, block_group) \
  41         (&(sb)->s_blockgroup_lock.locks[(block_group) & (NR_BG_LOCKS-1)].lock)
  42
  43 -
  44 +#endif
  45