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

Commit 376fdd2a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
  Blackfin arch: fix a broken define in dma-mapping
  Blackfin arch: fix bug - Turn on DEBUG_DOUBLEFAULT, booting SMP kernel crash
  Blackfin arch: fix bug - shared lib function in L2 failed be called
  Blackfin arch: fix incorrect limit check for bf54x check_gpio
  Blackfin arch: fix bug - Cpufreq assumes clocks in kHz and not Hz.
  Blackfin arch: dont warn when running a kernel on the oldest supported silicon
  Blackfin arch: fix bug - kernel build with write back policy fails to be booted up
  Blackfin arch: fix bug - dmacopy test case fail on all platform
  Blackfin arch: Fix typo when adding CONFIG_DEBUG_VERBOSE
  Blackfin arch: don't copy bss when copying L1
  Blackfin arch: fix bug - Fail to boot jffs2 kernel for BF561 with SMP patch
  Blackfin arch: handle case of d_path() returning error in decode_address()
parents af94ce06 62273eeb

arch/blackfin/include/asm/bfin-global.h

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ extern u16 _bfin_swrst; /* shadow for Software Reset Register (SWRST) */ 
extern unsigned long _ramstart, _ramend, _rambase;

extern unsigned long memory_start, memory_end, physical_mem_end;

extern char _stext_l1[], _etext_l1[], _sdata_l1[], _edata_l1[], _sbss_l1[],

	_ebss_l1[], _l1_lma_start[], _sdata_b_l1[], _ebss_b_l1[],

	_ebss_l1[], _l1_lma_start[], _sdata_b_l1[], _sbss_b_l1[], _ebss_b_l1[],

	_stext_l2[], _etext_l2[], _sdata_l2[], _edata_l2[], _sbss_l2[],

	_ebss_l2[], _l2_lma_start[];

arch/blackfin/include/asm/dma-mapping.h

+5 −1
Original line number Diff line number Diff line
@@ -15,7 +15,11 @@ void dma_free_coherent(struct device *dev, size_t size, void *vaddr, 
#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)

#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)



#define dma_mapping_error

static inline

int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)

{

	return 0;

}



/*

 * Map a single buffer of the indicated size for DMA in streaming mode.

arch/blackfin/kernel/bfin_gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ inline int check_gpio(unsigned gpio) 
	if (gpio == GPIO_PB15 || gpio == GPIO_PC14 || gpio == GPIO_PC15

	    || gpio == GPIO_PH14 || gpio == GPIO_PH15

	    || gpio == GPIO_PJ14 || gpio == GPIO_PJ15

	    || gpio > MAX_BLACKFIN_GPIOS)

	    || gpio >= MAX_BLACKFIN_GPIOS)

		return -EINVAL;

	return 0;

}

arch/blackfin/kernel/cplb-nompu/cplbinit.c

+5 −4
Original line number Diff line number Diff line
@@ -188,10 +188,11 @@ static struct cplb_desc cplb_data[] = { 


static u16 __init lock_kernel_check(u32 start, u32 end)

{

	if ((end   <= (u32) _end && end   >= (u32)_stext) ||

	    (start <= (u32) _end && start >= (u32)_stext))

		return IN_KERNEL;

	if (start >= (u32)_end || end <= (u32)_stext)

		return 0;



	/* This cplb block overlapped with kernel area. */

	return IN_KERNEL;

}



static unsigned short __init

arch/blackfin/kernel/process.c

+6 −1
Original line number Diff line number Diff line
@@ -351,9 +351,14 @@ int _access_ok(unsigned long addr, unsigned long size) 
		return 1;

#endif

#if L1_DATA_B_LENGTH != 0

	if (addr >= L1_DATA_B_START

	if (addr >= L1_DATA_B_START + (_ebss_b_l1 - _sdata_b_l1)

	    && addr + size <= L1_DATA_B_START + L1_DATA_B_LENGTH)

		return 1;

#endif

#if L2_LENGTH != 0

	if (addr >= L2_START + (_ebss_l2 - _stext_l2)

	    && addr + size <= L2_START + L2_LENGTH)

		return 1;

#endif

	return 0;

}