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

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha 

Pull alpha updates from Matt Turner:
 "A few small fixes and clean ups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
  alpha: fix crash if pthread_create races with signal delivery
  alpha: fix formating of stack content
  alpha: fix reboot on Avanti platform
  alpha: deprecate pci_get_bus_and_slot()
  alpha: Fix mixed up args in EXC macro in futex operations
  alpha: osf_sys.c: use timespec64 where appropriate
  alpha: osf_sys.c: fix put_tv32 regression
  alpha: make thread_saved_pc static
  alpha: make XTABS equivalent to TAB3
parents 03f51d4e 21ffceda

arch/alpha/include/asm/futex.h

+4 −4
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
	"3:	.subsection 2\n"				\

	"4:	br	1b\n"					\

	"	.previous\n"					\

	EXC(1b,3b,%1,$31)					\

	EXC(2b,3b,%1,$31)					\

	EXC(1b,3b,$31,%1)					\

	EXC(2b,3b,$31,%1)					\

	:	"=&r" (oldval), "=&r"(ret)			\

	:	"r" (uaddr), "r"(oparg)				\

	:	"memory")
@@ -82,8 +82,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, 
	"3:	.subsection 2\n"

	"4:	br	1b\n"

	"	.previous\n"

	EXC(1b,3b,%0,$31)

	EXC(2b,3b,%0,$31)

	EXC(1b,3b,$31,%0)

	EXC(2b,3b,$31,%0)

	:	"+r"(ret), "=&r"(prev), "=&r"(cmp)

	:	"r"(uaddr), "r"((long)(int)oldval), "r"(newval)

	:	"memory");

arch/alpha/include/asm/processor.h

+1 −4
Original line number Diff line number Diff line
@@ -40,15 +40,12 @@ typedef struct { 
struct thread_struct { };

#define INIT_THREAD  { }



/* Return saved PC of a blocked thread.  */

struct task_struct;

extern unsigned long thread_saved_pc(struct task_struct *);



/* Do necessary setup to start up a newly executed thread.  */

struct pt_regs;

extern void start_thread(struct pt_regs *, unsigned long, unsigned long);



/* Free all resources held by a thread. */

struct task_struct;

extern void release_thread(struct task_struct *);



unsigned long get_wchan(struct task_struct *p);

arch/alpha/include/uapi/asm/termbits.h

+5 −1
Original line number Diff line number Diff line
@@ -110,7 +110,11 @@ struct ktermios { 
#define VTDLY	00200000

#define   VT0	00000000

#define   VT1	00200000

#define XTABS	01000000 /* Hmm.. Linux/i386 considers this part of TABDLY.. */

/*

 * Should be equivalent to TAB3, see description of TAB3 in

 * POSIX.1-2008, Ch. 11.2.3 "Output Modes"

 */

#define XTABS	TAB3



/* c_cflag bit meaning */

#define CBAUD	0000037

arch/alpha/kernel/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ sys_pciconfig_iobase(long which, unsigned long bus, unsigned long dfn) 
		if (bus == 0 && dfn == 0) {

			hose = pci_isa_hose;

		} else {

			dev = pci_get_bus_and_slot(bus, dfn);

			dev = pci_get_domain_bus_and_slot(0, bus, dfn);

			if (!dev)

				return -ENODEV;

			hose = dev->sysdata;

arch/alpha/kernel/pci_impl.h

+2 −1
Original line number Diff line number Diff line
@@ -144,7 +144,8 @@ struct pci_iommu_arena 
};



#if defined(CONFIG_ALPHA_SRM) && \

    (defined(CONFIG_ALPHA_CIA) || defined(CONFIG_ALPHA_LCA))

    (defined(CONFIG_ALPHA_CIA) || defined(CONFIG_ALPHA_LCA) || \

     defined(CONFIG_ALPHA_AVANTI))

# define NEED_SRM_SAVE_RESTORE

#else

# undef NEED_SRM_SAVE_RESTORE