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

Commit 99642e21 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'avr32-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 

* 'avr32-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
  avr32: Fix OCD refcounting bug
  avr32: Call tick_nohz_{stop,restart}_sched_tick() in idle loop
  avr32: Use correct config symbol in atstk1004 board code
  avr32: Fix broken pte dump code in do_page_fault()
  AVR32: Define PAGE_SHARED
parents 84b9a774 325d6f55

arch/avr32/boards/atstk1000/atstk1004.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static int __init atstk1004_init(void) 
#ifdef CONFIG_BOARD_ATSTK100X_SPI1

	at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));

#endif

#ifndef CONFIG_BOARD_ATSTK1002_SW2_CUSTOM

#ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM

	at32_add_device_mci(0);

#endif

	at32_add_device_lcdc(0, &atstk1000_lcdc_data,

arch/avr32/kernel/process.c

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/fs.h>

#include <linux/ptrace.h>

#include <linux/reboot.h>

#include <linux/tick.h>

#include <linux/uaccess.h>

#include <linux/unistd.h>
@@ -30,8 +31,10 @@ void cpu_idle(void) 
{

	/* endless idle loop with no priority at all */

	while (1) {

		tick_nohz_stop_sched_tick();

		while (!need_resched())

			cpu_idle_sleep();

		tick_nohz_restart_sched_tick();

		preempt_enable_no_resched();

		schedule();

		preempt_disable();
@@ -345,6 +348,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, 
	p->thread.cpu_context.ksp = (unsigned long)childregs;

	p->thread.cpu_context.pc = (unsigned long)ret_from_fork;



	clear_tsk_thread_flag(p, TIF_DEBUG);

	if ((clone_flags & CLONE_PTRACE) && test_thread_flag(TIF_DEBUG))

		ocd_enable(p);

arch/avr32/mm/fault.c

+2 −0
Original line number Diff line number Diff line
@@ -189,6 +189,8 @@ no_context: 


	page = sysreg_read(PTBR);

	printk(KERN_ALERT "ptbr = %08lx", page);

	if (address >= TASK_SIZE)

		page = (unsigned long)swapper_pg_dir;

	if (page) {

		page = ((unsigned long *)page)[address >> 22];

		printk(" pgd = %08lx", page);

include/asm-avr32/pgtable.h

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ extern struct page *empty_zero_page; 
#define _PAGE_S(x)	_PAGE_NORMAL(x)



#define PAGE_COPY	_PAGE_P(PAGE_WRITE | PAGE_READ)

#define PAGE_SHARED	_PAGE_S(PAGE_WRITE | PAGE_READ)



#ifndef __ASSEMBLY__

/*