[PATCH 1/1] staging: lustre: Remove circular dependency on header

[PATCH 1/1] staging: lustre: Remove circular dependency on header

[Pranith Kumar]

The following patch fixes a build error on sparc32. I think it should go to
stable 3.16.

Remove a circular dependency on atomic.h header file which leads to compilation
failure on sparc32 as reported here:
http://kisskb.ellerman.id.au/kisskb/buildresult/11340509/

The specific dependency is as follows:

In file included from arch/sparc/include/asm/smp_32.h:24:0,
                 from arch/sparc/include/asm/smp.h:6,
                 from arch/sparc/include/asm/switch_to_32.h:4,
                 from arch/sparc/include/asm/switch_to.h:6,
                 from arch/sparc/include/asm/ptrace.h:84,
                 from arch/sparc/include/asm/processor_32.h:16,
                 from arch/sparc/include/asm/processor.h:6,
                 from arch/sparc/include/asm/barrier_32.h:4,
                 from arch/sparc/include/asm/barrier.h:6,
                 from arch/sparc/include/asm/atomic_32.h:17,
                 from arch/sparc/include/asm/atomic.h:6,
                 from drivers/staging/lustre/lustre/obdclass/class_obd.c:38

Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
CC: stable@vger.kernel.org
---
 drivers/staging/lustre/lustre/obdclass/class_obd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/lustre/lustre/obdclass/class_obd.c b/drivers/staging/lustre/lustre/obdclass/class_obd.c
index 8b19f3c..701c6a7 100644
--- a/drivers/staging/lustre/lustre/obdclass/class_obd.c
+++ b/drivers/staging/lustre/lustre/obdclass/class_obd.c
@@ -35,7 +35,7 @@
  */
 
 #define DEBUG_SUBSYSTEM S_CLASS
-# include <asm/atomic.h>
+# include <linux/atomic.h>
 
 #include "../include/obd_support.h"
 #include "../include/obd_class.h"
-- 
1.9.1

Re: [PATCH 1/1] staging: lustre: Remove circular dependency on header

[Pranith Kumar]

Please note, this also fixes the following build error on sparc64

http://kisskb.ellerman.id.au/kisskb/buildresult/11607883/

On Tue, Aug 5, 2014 at 12:27 PM, Pranith Kumar <bobby.prani@gmail.com> wrote:
> The following patch fixes a build error on sparc32. I think it should go to
> stable 3.16.
>
> Remove a circular dependency on atomic.h header file which leads to compilation
> failure on sparc32 as reported here:
> http://kisskb.ellerman.id.au/kisskb/buildresult/11340509/
>
> The specific dependency is as follows:
>
> In file included from arch/sparc/include/asm/smp_32.h:24:0,
>                  from arch/sparc/include/asm/smp.h:6,
>                  from arch/sparc/include/asm/switch_to_32.h:4,
>                  from arch/sparc/include/asm/switch_to.h:6,
>                  from arch/sparc/include/asm/ptrace.h:84,
>                  from arch/sparc/include/asm/processor_32.h:16,
>                  from arch/sparc/include/asm/processor.h:6,
>                  from arch/sparc/include/asm/barrier_32.h:4,
>                  from arch/sparc/include/asm/barrier.h:6,
>                  from arch/sparc/include/asm/atomic_32.h:17,
>                  from arch/sparc/include/asm/atomic.h:6,
>                  from drivers/staging/lustre/lustre/obdclass/class_obd.c:38
>
> Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
> CC: stable@vger.kernel.org
> ---
>  drivers/staging/lustre/lustre/obdclass/class_obd.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/lustre/lustre/obdclass/class_obd.c b/drivers/staging/lustre/lustre/obdclass/class_obd.c
> index 8b19f3c..701c6a7 100644
> --- a/drivers/staging/lustre/lustre/obdclass/class_obd.c
> +++ b/drivers/staging/lustre/lustre/obdclass/class_obd.c
> @@ -35,7 +35,7 @@
>   */
>
>  #define DEBUG_SUBSYSTEM S_CLASS
> -# include <asm/atomic.h>
> +# include <linux/atomic.h>
>
>  #include "../include/obd_support.h"
>  #include "../include/obd_class.h"
> --
> 1.9.1
>



-- 
Pranith