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

Commit 4551ae0a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'v3.2-rc6' into next/drivers

parents e2c236f0 384703b8

Documentation/ABI/testing/sysfs-bus-rbd

+0 −7
Original line number Diff line number Diff line
@@ -57,13 +57,6 @@ create_snap 


	 $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_create



rollback_snap



	Rolls back data to the specified snapshot. This goes over the entire

	list of rados blocks and sends a rollback command to each.



	 $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_rollback



snap_*



	A directory per each snapshot

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 2

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

arch/arm/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -220,8 +220,9 @@ config NEED_MACH_MEMORY_H 
	  be avoided when possible.



config PHYS_OFFSET

	hex "Physical address of main memory"

	hex "Physical address of main memory" if MMU

	depends on !ARM_PATCH_PHYS_VIRT && !NEED_MACH_MEMORY_H

	default DRAM_BASE if !MMU

	help

	  Please provide the physical address corresponding to the

	  location of main memory in your system.

arch/arm/include/asm/unwind.h

+4 −12
Original line number Diff line number Diff line
@@ -30,14 +30,15 @@ enum unwind_reason_code { 
};



struct unwind_idx {

	unsigned long addr;

	unsigned long addr_offset;

	unsigned long insn;

};



struct unwind_table {

	struct list_head list;

	struct unwind_idx *start;

	struct unwind_idx *stop;

	const struct unwind_idx *start;

	const struct unwind_idx *origin;

	const struct unwind_idx *stop;

	unsigned long begin_addr;

	unsigned long end_addr;

};
@@ -49,15 +50,6 @@ extern struct unwind_table *unwind_table_add(unsigned long start, 
extern void unwind_table_del(struct unwind_table *tab);

extern void unwind_backtrace(struct pt_regs *regs, struct task_struct *tsk);



#ifdef CONFIG_ARM_UNWIND

extern int __init unwind_init(void);

#else

static inline int __init unwind_init(void)

{

	return 0;

}

#endif



#endif	/* !__ASSEMBLY__ */



#ifdef CONFIG_ARM_UNWIND

arch/arm/kernel/perf_event.c

+3 −0
Original line number Diff line number Diff line
@@ -640,6 +640,9 @@ static struct platform_device_id armpmu_plat_device_ids[] = { 


static int __devinit armpmu_device_probe(struct platform_device *pdev)

{

	if (!cpu_pmu)

		return -ENODEV;



	cpu_pmu->plat_device = pdev;

	return 0;

}