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

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

Merge branch 'unicore32' of git://github.com/gxt/linux 

* 'unicore32' of git://github.com/gxt/linux:
  rtc-puv3: solve section mismatch in rtc-puv3.c
  rtc-puv3: using module_platform_driver()
  i2c-puv3: using module_platform_driver()
  rtc-puv3: irq: remove IRQF_DISABLED
  unicore32: Remove IRQF_DISABLED
  unicore32: Use set_current_blocked()
  unicore32: add ioremap_nocache definition
  unicore32: delete specified xlate_dev_mem_ptr
  of: add include asm/setup.h in drivers/of/fdt.c
  unicore32: standardize /proc/iomem "Kernel code" name
parents 28190145 b3a0aa3a

arch/unicore32/include/asm/io.h

+1 −7
Original line number Diff line number Diff line
@@ -37,15 +37,9 @@ extern void __uc32_iounmap(volatile void __iomem *addr); 
 */

#define ioremap(cookie, size)		__uc32_ioremap(cookie, size)

#define ioremap_cached(cookie, size)	__uc32_ioremap_cached(cookie, size)

#define ioremap_nocache(cookie, size)	__uc32_ioremap(cookie, size)

#define iounmap(cookie)			__uc32_iounmap(cookie)



/*

 * Convert a physical pointer to a virtual kernel pointer for /dev/mem

 * access

 */

#undef xlate_dev_mem_ptr

#define xlate_dev_mem_ptr(p)	__va(p)



#define HAVE_ARCH_PIO_SIZE

#define PIO_OFFSET		(unsigned int)(PCI_IOBASE)

#define PIO_MASK		(unsigned int)(IO_SPACE_LIMIT)

arch/unicore32/kernel/puv3-nb0916.c

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ int __init mach_nb0916_init(void) 


	if (request_irq(gpio_to_irq(GPI_LCD_CASE_OFF),

		&nb0916_lcdcaseoff_handler,

		IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

		IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

		"NB0916 lcd case off", NULL) < 0) {



		printk(KERN_DEBUG "LCD-Case-OFF IRQ %d not available\n",
@@ -131,7 +131,7 @@ int __init mach_nb0916_init(void) 
	}



	if (request_irq(gpio_to_irq(GPI_OTP_INT), &nb0916_overheat_handler,

		IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

		IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

		"NB0916 overheating protection", NULL) < 0) {



		printk(KERN_DEBUG "Overheating Protection IRQ %d not available\n",

arch/unicore32/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE; 
 */

static struct resource mem_res[] = {

	{

		.name = "Kernel text",

		.name = "Kernel code",

		.start = 0,

		.end = 0,

		.flags = IORESOURCE_MEM

arch/unicore32/kernel/signal.c

+5 −10
Original line number Diff line number Diff line
@@ -63,10 +63,7 @@ static int restore_sigframe(struct pt_regs *regs, struct sigframe __user *sf) 
	err = __copy_from_user(&set, &sf->uc.uc_sigmask, sizeof(set));

	if (err == 0) {

		sigdelsetmask(&set, ~_BLOCKABLE);

		spin_lock_irq(&current->sighand->siglock);

		current->blocked = set;

		recalc_sigpending();

		spin_unlock_irq(&current->sighand->siglock);

		set_current_blocked(&set);

	}



	err |= __get_user(regs->UCreg_00, &sf->uc.uc_mcontext.regs.UCreg_00);
@@ -321,6 +318,7 @@ static int handle_signal(unsigned long sig, struct k_sigaction *ka, 
{

	struct thread_info *thread = current_thread_info();

	struct task_struct *tsk = current;

	sigset_t blocked;

	int usig = sig;

	int ret;
@@ -372,13 +370,10 @@ static int handle_signal(unsigned long sig, struct k_sigaction *ka, 
	/*

	 * Block the signal if we were successful.

	 */

	spin_lock_irq(&tsk->sighand->siglock);

	sigorsets(&tsk->blocked, &tsk->blocked,

		  &ka->sa.sa_mask);

	sigorsets(&blocked, &tsk->blocked, &ka->sa.sa_mask);

	if (!(ka->sa.sa_flags & SA_NODEFER))

		sigaddset(&tsk->blocked, sig);

	recalc_sigpending();

	spin_unlock_irq(&tsk->sighand->siglock);

		sigaddset(&blocked, sig);

	set_current_blocked(&blocked);



	return 0;

}

arch/unicore32/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static struct clocksource cksrc_puv3_oscr = { 


static struct irqaction puv3_timer_irq = {

	.name		= "ost0",

	.flags		= IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,

	.flags		= IRQF_TIMER | IRQF_IRQPOLL,

	.handler	= puv3_ost0_interrupt,

	.dev_id		= &ckevt_puv3_osmr0,

};