Commit a5c2edf5 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'mce-fix-for-3.3-rc6' of... 

Merge tag 'mce-fix-for-3.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras

 into x86/urgent

Fix a reproducible RCU warning in the MCE code

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents e37aade3 b11e3d78

Makefile

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

PATCHLEVEL = 3

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

arch/parisc/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -31,7 +31,11 @@ ifdef CONFIG_64BIT 
UTS_MACHINE	:= parisc64

CHECKFLAGS	+= -D__LP64__=1 -m64

WIDTH		:= 64



# FIXME: if no default set, should really try to locate dynamically

ifeq ($(CROSS_COMPILE),)

CROSS_COMPILE	:= hppa64-linux-gnu-

endif

else # 32-bit

WIDTH		:=

endif

arch/x86/kernel/cpu/mcheck/mce.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static void drain_mcelog_buffer(void) 
{

	unsigned int next, i, prev = 0;



	next = rcu_dereference_check_mce(mcelog.next);

	next = ACCESS_ONCE(mcelog.next);



	do {

		struct mce *m;

drivers/parisc/iommu-helpers.h

+2 −0
Original line number Diff line number Diff line 
#include <linux/prefetch.h>



/**

 * iommu_fill_pdir - Insert coalesced scatter/gather chunks into the I/O Pdir.

 * @ioc: The I/O Controller.

drivers/scsi/osd/osd_uld.c

+2 −2
Original line number Diff line number Diff line
@@ -69,10 +69,10 @@ 
#ifndef SCSI_OSD_MAJOR

#  define SCSI_OSD_MAJOR 260

#endif

#define SCSI_OSD_MAX_MINOR 64

#define SCSI_OSD_MAX_MINOR MINORMASK



static const char osd_name[] = "osd";

static const char *osd_version_string = "open-osd 0.2.0";

static const char *osd_version_string = "open-osd 0.2.1";



MODULE_AUTHOR("Boaz Harrosh <bharrosh@panasas.com>");

MODULE_DESCRIPTION("open-osd Upper-Layer-Driver osd.ko");