lustre/kernel_patches/patches/header-guards-2.6-suse.patch

   1 Index: linux-2.6.4-30.1/include/linux/percpu_counter.h
   2 ===================================================================
   3 --- linux-2.6.4-30.1.orig/include/linux/percpu_counter.h        2004-03-26 03:33:43.000000000 -0500
   4 +++ linux-2.6.4-30.1/include/linux/percpu_counter.h     2004-04-02 02:09:30.000000000 -0500
   5 @@ -3,6 +3,8 @@
   6   *
   7   * WARNING: these things are HUGE.  4 kbytes per counter on 32-way P4.
   8   */
   9 +#ifndef _LINUX_PERCPU_COUNTER_H
  10 +#define _LINUX_PERCPU_COUNTER_H
  11
  12  #include <linux/config.h>
  13  #include <linux/spinlock.h>
  14 @@ -101,3 +103,5 @@
  15  {
  16         percpu_counter_mod(fbc, -1);
  17  }
  18 +
  19 +#endif /* _LINUX_PERCPU_COUNTER_H */
  20 Index: linux-2.6.4-30.1/include/linux/blockgroup_lock.h
  21 ===================================================================
  22 --- linux-2.6.4-30.1.orig/include/linux/blockgroup_lock.h       2004-03-26 03:33:43.000000000 -0500
  23 +++ linux-2.6.4-30.1/include/linux/blockgroup_lock.h    2004-04-02 02:14:20.000000000 -0500
  24 @@ -3,6 +3,8 @@
  25   *
  26   * Simple hashed spinlocking.
  27   */
  28 +#ifndef _LINUX_BLOCKGROUP_LOCK_H
  29 +#define _LINUX_BLOCKGROUP_LOCK_H
  30
  31  #include <linux/config.h>
  32  #include <linux/spinlock.h>
  33 @@ -55,4 +57,4 @@
  34  #define sb_bgl_lock(sb, block_group) \
  35         (&(sb)->s_blockgroup_lock.locks[(block_group) & (NR_BG_LOCKS-1)].lock)
  36
  37 -
  38 +#endif