Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9c56619 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Do not clobber %g7 in setcontext() trap.
  sparc64: Kill __show_regs().
  sparc: Add __KERNEL__ ifdef protection to pt_regs helpers.
  sparc64: Kill smp_report_regs().
  sparc64: Kill VERBOSE_SHOWREGS code.
  sparc64: Hook up trigger_all_cpu_backtrace().
  sparc64: Make global reg dumping even more useful.
  sparc: Ignore drivers/video/console/promcon_tbl.c conmakehash generated file
  sparc64: FUTEX_OP_ANDN fix
  sparc: merge of_platform_{32,64}.h
  sparc64: Kill isa_bus_type.
  sparc64: Fix global reg snapshotting on self-cpu.
parents 17263849 0a4949c4

arch/sparc/include/asm/futex_64.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr) 
		__futex_cas_op("or\t%2, %4, %1", ret, oldval, uaddr, oparg);

		break;

	case FUTEX_OP_ANDN:

		__futex_cas_op("and\t%2, %4, %1", ret, oldval, uaddr, oparg);

		__futex_cas_op("andn\t%2, %4, %1", ret, oldval, uaddr, oparg);

		break;

	case FUTEX_OP_XOR:

		__futex_cas_op("xor\t%2, %4, %1", ret, oldval, uaddr, oparg);

arch/sparc/include/asm/irq_64.h

+3 −0
Original line number Diff line number Diff line
@@ -90,4 +90,7 @@ static inline unsigned long get_softint(void) 
	return retval;

}



void __trigger_all_cpu_backtrace(void);

#define trigger_all_cpu_backtrace() __trigger_all_cpu_backtrace()



#endif

arch/sparc/include/asm/of_platform.h

+21 −5
Original line number Diff line number Diff line 
#ifndef ___ASM_SPARC_OF_PLATFORM_H

#define ___ASM_SPARC_OF_PLATFORM_H

#if defined(__sparc__) && defined(__arch64__)

#include <asm/of_platform_64.h>

#else

#include <asm/of_platform_32.h>

#endif

/*

 *    Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.

 *			 <benh@kernel.crashing.org>

 *    Modified for Sparc by merging parts of asm/of_device.h

 *		by Stephen Rothwell

 *

 *  This program is free software; you can redistribute it and/or

 *  modify it under the terms of the GNU General Public License

 *  as published by the Free Software Foundation; either version

 *  2 of the License, or (at your option) any later version.

 *

 */



/* This is just here during the transition */

#include <linux/of_platform.h>



extern struct bus_type ebus_bus_type;

extern struct bus_type sbus_bus_type;



#define of_bus_type	of_platform_bus_type	/* for compatibility */



#endif

arch/sparc/include/asm/of_platform_32.h

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
#ifndef _ASM_SPARC_OF_PLATFORM_H

#define _ASM_SPARC_OF_PLATFORM_H

/*

 *    Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.

 *			 <benh@kernel.crashing.org>

 *    Modified for Sparc by merging parts of asm/of_device.h

 *		by Stephen Rothwell

 *

 *  This program is free software; you can redistribute it and/or

 *  modify it under the terms of the GNU General Public License

 *  as published by the Free Software Foundation; either version

 *  2 of the License, or (at your option) any later version.

 *

 */



/* This is just here during the transition */

#include <linux/of_platform.h>



extern struct bus_type ebus_bus_type;

extern struct bus_type sbus_bus_type;



#define of_bus_type	of_platform_bus_type	/* for compatibility */



#endif	/* _ASM_SPARC_OF_PLATFORM_H */

arch/sparc/include/asm/of_platform_64.h

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
#ifndef _ASM_SPARC64_OF_PLATFORM_H

#define _ASM_SPARC64_OF_PLATFORM_H

/*

 *    Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.

 *			 <benh@kernel.crashing.org>

 *    Modified for Sparc by merging parts of asm/of_device.h

 *		by Stephen Rothwell

 *

 *  This program is free software; you can redistribute it and/or

 *  modify it under the terms of the GNU General Public License

 *  as published by the Free Software Foundation; either version

 *  2 of the License, or (at your option) any later version.

 *

 */



/* This is just here during the transition */

#include <linux/of_platform.h>



extern struct bus_type isa_bus_type;

extern struct bus_type ebus_bus_type;

extern struct bus_type sbus_bus_type;



#define of_bus_type	of_platform_bus_type	/* for compatibility */



#endif	/* _ASM_SPARC64_OF_PLATFORM_H */