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

Commit 2c1179af authored by Larry Finger's avatar Larry Finger
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

parents 5519ec12 e36c886a

arch/x86/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -754,11 +754,11 @@ config IOMMU_API 
	def_bool (AMD_IOMMU || DMAR)



config MAXSMP

	bool "Configure Maximum number of SMP Processors and NUMA Nodes"

	bool "Enable Maximum number of SMP Processors and NUMA Nodes"

	depends on X86_64 && SMP && DEBUG_KERNEL && EXPERIMENTAL

	select CPUMASK_OFFSTACK

	---help---

	  Configure maximum number of CPUS and NUMA Nodes for this architecture.

	  Enable maximum number of CPUS and NUMA Nodes for this architecture.

	  If unsure, say N.



config NR_CPUS

drivers/mtd/nand/nand_base.c

+4 −7
Original line number Diff line number Diff line
@@ -2866,6 +2866,7 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, 
		 */

		if (id_data[0] == id_data[6] && id_data[1] == id_data[7] &&

				id_data[0] == NAND_MFR_SAMSUNG &&

				(chip->cellinfo & NAND_CI_CELLTYPE_MSK) &&

				id_data[5] != 0x00) {

			/* Calc pagesize */

			mtd->writesize = 2048 << (extid & 0x03);
@@ -2934,14 +2935,10 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, 
		chip->chip_shift = ffs((unsigned)(chip->chipsize >> 32)) + 32 - 1;



	/* Set the bad block position */

	if (!(busw & NAND_BUSWIDTH_16) && (*maf_id == NAND_MFR_STMICRO ||

				(*maf_id == NAND_MFR_SAMSUNG &&

				 mtd->writesize == 512) ||

				*maf_id == NAND_MFR_AMD))

		chip->badblockpos = NAND_SMALL_BADBLOCK_POS;

	else

	if (mtd->writesize > 512 || (busw & NAND_BUSWIDTH_16))

		chip->badblockpos = NAND_LARGE_BADBLOCK_POS;



	else

		chip->badblockpos = NAND_SMALL_BADBLOCK_POS;



	/* Get chip options, preserve non chip based options */

	chip->options &= ~NAND_CHIPOPTIONS_MSK;

drivers/mtd/nand/pxa3xx_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ static struct pxa3xx_nand_flash *builtin_flash_types[] = { 
#define tAR_NDTR1(r)	(((r) >> 0) & 0xf)



/* convert nano-seconds to nand flash controller clock cycles */

#define ns2cycle(ns, clk)	(int)(((ns) * (clk / 1000000) / 1000) - 1)

#define ns2cycle(ns, clk)	(int)((ns) * (clk / 1000000) / 1000)



/* convert nand flash controller clock cycles to nano-seconds */

#define cycle2ns(c, clk)	((((c) + 1) * 1000000 + clk / 500) / (clk / 1000))

include/linux/mm_types.h

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ struct vm_area_struct { 
					   within vm_mm. */



	/* linked list of VM areas per task, sorted by address */

	struct vm_area_struct *vm_next;

	struct vm_area_struct *vm_next, *vm_prev;



	pgprot_t vm_page_prot;		/* Access permissions of this VMA. */

	unsigned long vm_flags;		/* Flags, see mm.h. */

include/trace/events/workqueue.h

0 → 100644
+62 −0
Original line number Diff line number Diff line 
#undef TRACE_SYSTEM

#define TRACE_SYSTEM workqueue



#if !defined(_TRACE_WORKQUEUE_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_WORKQUEUE_H



#include <linux/tracepoint.h>

#include <linux/workqueue.h>



/**

 * workqueue_execute_start - called immediately before the workqueue callback

 * @work:	pointer to struct work_struct

 *

 * Allows to track workqueue execution.

 */

TRACE_EVENT(workqueue_execute_start,



	TP_PROTO(struct work_struct *work),



	TP_ARGS(work),



	TP_STRUCT__entry(

		__field( void *,	work	)

		__field( void *,	function)

	),



	TP_fast_assign(

		__entry->work		= work;

		__entry->function	= work->func;

	),



	TP_printk("work struct %p: function %pf", __entry->work, __entry->function)

);



/**

 * workqueue_execute_end - called immediately before the workqueue callback

 * @work:	pointer to struct work_struct

 *

 * Allows to track workqueue execution.

 */

TRACE_EVENT(workqueue_execute_end,



	TP_PROTO(struct work_struct *work),



	TP_ARGS(work),



	TP_STRUCT__entry(

		__field( void *,	work	)

	),



	TP_fast_assign(

		__entry->work		= work;

	),



	TP_printk("work struct %p", __entry->work)

);





#endif /*  _TRACE_WORKQUEUE_H */



/* This part must be outside protection */

#include <trace/define_trace.h>