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

Commit df87f8c0 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-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
  alpha: Fixup last users of irq_chip->typename
  Alpha: Rearrange thread info flags fixing two regressions
  arch/alpha/kernel: Add kmalloc NULL tests
  arch/alpha/kernel/sys_ruffian.c: Use DIV_ROUND_CLOSEST
parents 3350b2ac 8ab1221c

arch/alpha/include/asm/thread_info.h

+15 −12
Original line number Diff line number Diff line
@@ -61,21 +61,24 @@ register struct thread_info *__current_thread_info __asm__("$8"); 
/*

 * Thread information flags:

 * - these are process state flags and used from assembly

 * - pending work-to-be-done flags come first to fit in and immediate operand.

 * - pending work-to-be-done flags come first and must be assigned to be

 *   within bits 0 to 7 to fit in and immediate operand.

 * - ALPHA_UAC_SHIFT below must be kept consistent with the unaligned

 *   control flags.

 *

 * TIF_SYSCALL_TRACE is known to be 0 via blbs.

 */

#define TIF_SYSCALL_TRACE	0	/* syscall trace active */

#define TIF_SIGPENDING		1	/* signal pending */

#define TIF_NEED_RESCHED	2	/* rescheduling necessary */

#define TIF_POLLING_NRFLAG	3	/* poll_idle is polling NEED_RESCHED */

#define TIF_DIE_IF_KERNEL	4	/* dik recursion lock */

#define TIF_UAC_NOPRINT		5	/* see sysinfo.h */

#define TIF_UAC_NOFIX		6

#define TIF_UAC_SIGBUS		7

#define TIF_MEMDIE		8

#define TIF_RESTORE_SIGMASK	9	/* restore signal mask in do_signal */

#define TIF_NOTIFY_RESUME	10	/* callback before returning to user */

#define TIF_NOTIFY_RESUME	1	/* callback before returning to user */

#define TIF_SIGPENDING		2	/* signal pending */

#define TIF_NEED_RESCHED	3	/* rescheduling necessary */

#define TIF_POLLING_NRFLAG	8	/* poll_idle is polling NEED_RESCHED */

#define TIF_DIE_IF_KERNEL	9	/* dik recursion lock */

#define TIF_UAC_NOPRINT		10	/* see sysinfo.h */

#define TIF_UAC_NOFIX		11

#define TIF_UAC_SIGBUS		12

#define TIF_MEMDIE		13

#define TIF_RESTORE_SIGMASK	14	/* restore signal mask in do_signal */

#define TIF_FREEZE		16	/* is freezing for suspend */



#define _TIF_SYSCALL_TRACE	(1<<TIF_SYSCALL_TRACE)
@@ -94,7 +97,7 @@ register struct thread_info *__current_thread_info __asm__("$8"); 
#define _TIF_ALLWORK_MASK	(_TIF_WORK_MASK		\

				 | _TIF_SYSCALL_TRACE)



#define ALPHA_UAC_SHIFT		6

#define ALPHA_UAC_SHIFT		10

#define ALPHA_UAC_MASK		(1 << TIF_UAC_NOPRINT | 1 << TIF_UAC_NOFIX | \

				 1 << TIF_UAC_SIGBUS)

arch/alpha/kernel/core_marvel.c

+2 −0
Original line number Diff line number Diff line
@@ -1103,6 +1103,8 @@ marvel_agp_info(void) 
	 * Allocate the info structure.

	 */

	agp = kmalloc(sizeof(*agp), GFP_KERNEL);

	if (!agp)

		return NULL;



	/*

	 * Fill it in.

arch/alpha/kernel/core_titan.c

+2 −0
Original line number Diff line number Diff line
@@ -757,6 +757,8 @@ titan_agp_info(void) 
	 * Allocate the info structure.

	 */

	agp = kmalloc(sizeof(*agp), GFP_KERNEL);

	if (!agp)

		return NULL;



	/*

	 * Fill it in.

arch/alpha/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ show_interrupts(struct seq_file *p, void *v) 
		for_each_online_cpu(j)

			seq_printf(p, "%10u ", kstat_irqs_cpu(irq, j));

#endif

		seq_printf(p, " %14s", irq_desc[irq].chip->typename);

		seq_printf(p, " %14s", irq_desc[irq].chip->name);

		seq_printf(p, "  %c%s",

			(action->flags & IRQF_DISABLED)?'+':' ',

			action->name);

arch/alpha/kernel/irq_alpha.c

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ struct irqaction timer_irqaction = { 
};



static struct irq_chip rtc_irq_type = {

	.typename	= "RTC",

	.name		= "RTC",

	.startup	= rtc_startup,

	.shutdown	= rtc_enable_disable,

	.enable		= rtc_enable_disable,