Commit 4f57d865 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' 

Quoth Andrew:
  "Random fixes.  And a simple new LED driver which I'm trying to sneak
   in while you're not looking."

Sneaking successful.

* akpm:
  score: fix off-by-one index into syscall table
  mm: fix rss count leakage during migration
  SHM_UNLOCK: fix Unevictable pages stranded after swap
  SHM_UNLOCK: fix long unpreemptible section
  kdump: define KEXEC_NOTE_BYTES arch specific for s390x
  mm/hugetlb.c: undo change to page mapcount in fault handler
  mm: memcg: update the correct soft limit tree during migration
  proc: clear_refs: do not clear reserved pages
  drivers/video/backlight/l4f00242t03.c: return proper error in l4f00242t03_probe if regulator_get() fails
  drivers/video/backlight/adp88x0_bl.c: fix bit testing logic
  kprobes: initialize before using a hlist
  ipc/mqueue: simplify reading msgqueue limit
  leds: add led driver for Bachmann's ot200
  mm: __count_immobile_pages(): make sure the node is online
  mm: fix NULL ptr dereference in __count_immobile_pages
  mm: fix warnings regarding enum migrate_mode
parents 46c5b83b c25a785d

arch/s390/include/asm/kexec.h

+18 −0
Original line number Diff line number Diff line
@@ -42,6 +42,24 @@ 
/* The native architecture */

#define KEXEC_ARCH KEXEC_ARCH_S390



/*

 * Size for s390x ELF notes per CPU

 *

 * Seven notes plus zero note at the end: prstatus, fpregset, timer,

 * tod_cmp, tod_reg, control regs, and prefix

 */

#define KEXEC_NOTE_BYTES \

	(ALIGN(sizeof(struct elf_note), 4) * 8 + \

	 ALIGN(sizeof("CORE"), 4) * 7 + \

	 ALIGN(sizeof(struct elf_prstatus), 4) + \

	 ALIGN(sizeof(elf_fpregset_t), 4) + \

	 ALIGN(sizeof(u64), 4) + \

	 ALIGN(sizeof(u64), 4) + \

	 ALIGN(sizeof(u32), 4) + \

	 ALIGN(sizeof(u64) * 16, 4) + \

	 ALIGN(sizeof(u32), 4) \

	)



/* Provide a dummy definition to avoid build failures. */

static inline void crash_setup_regs(struct pt_regs *newregs,

					struct pt_regs *oldregs) { }

arch/score/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ ENTRY(handle_sys) 
	sw	r9, [r0, PT_EPC]



	cmpi.c	r27, __NR_syscalls 	# check syscall number

	bgtu	illegal_syscall

	bgeu	illegal_syscall



	slli	r8, r27, 2		# get syscall routine

	la	r11, sys_call_table

drivers/leds/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -403,6 +403,13 @@ config LEDS_MAX8997 
	  This option enables support for on-chip LED drivers on

	  MAXIM MAX8997 PMIC.



config LEDS_OT200

	tristate "LED support for the Bachmann OT200"

	depends on LEDS_CLASS && HAS_IOMEM

	help

	  This option enables support for the LEDs on the Bachmann OT200.

	  Say Y to enable LEDs on the Bachmann OT200.



config LEDS_TRIGGERS

	bool "LED Trigger support"

	depends on LEDS_CLASS

drivers/leds/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ obj-$(CONFIG_LEDS_LP5523) += leds-lp5523.o 
obj-$(CONFIG_LEDS_TCA6507)		+= leds-tca6507.o

obj-$(CONFIG_LEDS_CLEVO_MAIL)		+= leds-clevo-mail.o

obj-$(CONFIG_LEDS_HP6XX)		+= leds-hp6xx.o

obj-$(CONFIG_LEDS_OT200)		+= leds-ot200.o

obj-$(CONFIG_LEDS_FSG)			+= leds-fsg.o

obj-$(CONFIG_LEDS_PCA955X)		+= leds-pca955x.o

obj-$(CONFIG_LEDS_DA903X)		+= leds-da903x.o

drivers/leds/leds-ot200.c

0 → 100644
+171 −0
Original line number Diff line number Diff line 
/*

 * Bachmann ot200 leds driver.

 *

 * Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

 *         Christian Gmeiner <christian.gmeiner@gmail.com>

 *

 * License: GPL as published by the FSF.

 */



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/leds.h>

#include <linux/io.h>

#include <linux/module.h>





struct ot200_led {

	struct led_classdev cdev;

	const char *name;

	unsigned long port;

	u8 mask;

};



/*

 * The device has three leds on the back panel (led_err, led_init and led_run)

 * and can handle up to seven leds on the front panel.

 */



static struct ot200_led leds[] = {

	{

		.name = "led_run",

		.port = 0x5a,

		.mask = BIT(0),

	},

	{

		.name = "led_init",

		.port = 0x5a,

		.mask = BIT(1),

	},

	{

		.name = "led_err",

		.port = 0x5a,

		.mask = BIT(2),

	},

	{

		.name = "led_1",

		.port = 0x49,

		.mask = BIT(7),

	},

	{

		.name = "led_2",

		.port = 0x49,

		.mask = BIT(6),

	},

	{

		.name = "led_3",

		.port = 0x49,

		.mask = BIT(5),

	},

	{

		.name = "led_4",

		.port = 0x49,

		.mask = BIT(4),

	},

	{

		.name = "led_5",

		.port = 0x49,

		.mask = BIT(3),

	},

	{

		.name = "led_6",

		.port = 0x49,

		.mask = BIT(2),

	},

	{

		.name = "led_7",

		.port = 0x49,

		.mask = BIT(1),

	}

};



static DEFINE_SPINLOCK(value_lock);



/*

 * we need to store the current led states, as it is not

 * possible to read the current led state via inb().

 */

static u8 leds_back;

static u8 leds_front;



static void ot200_led_brightness_set(struct led_classdev *led_cdev,

		enum led_brightness value)

{

	struct ot200_led *led = container_of(led_cdev, struct ot200_led, cdev);

	u8 *val;

	unsigned long flags;



	spin_lock_irqsave(&value_lock, flags);



	if (led->port == 0x49)

		val = &leds_front;

	else if (led->port == 0x5a)

		val = &leds_back;

	else

		BUG();



	if (value == LED_OFF)

		*val &= ~led->mask;

	else

		*val |= led->mask;



	outb(*val, led->port);

	spin_unlock_irqrestore(&value_lock, flags);

}



static int __devinit ot200_led_probe(struct platform_device *pdev)

{

	int i;

	int ret;



	for (i = 0; i < ARRAY_SIZE(leds); i++) {



		leds[i].cdev.name = leds[i].name;

		leds[i].cdev.brightness_set = ot200_led_brightness_set;



		ret = led_classdev_register(&pdev->dev, &leds[i].cdev);

		if (ret < 0)

			goto err;

	}



	leds_front = 0;		/* turn off all front leds */

	leds_back = BIT(1);	/* turn on init led */

	outb(leds_front, 0x49);

	outb(leds_back, 0x5a);



	return 0;



err:

	for (i = i - 1; i >= 0; i--)

		led_classdev_unregister(&leds[i].cdev);



	return ret;

}



static int __devexit ot200_led_remove(struct platform_device *pdev)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(leds); i++)

		led_classdev_unregister(&leds[i].cdev);



	return 0;

}



static struct platform_driver ot200_led_driver = {

	.probe		= ot200_led_probe,

	.remove		= __devexit_p(ot200_led_remove),

	.driver		= {

		.name	= "leds-ot200",

		.owner	= THIS_MODULE,

	},

};



module_platform_driver(ot200_led_driver);



MODULE_AUTHOR("Sebastian A. Siewior <bigeasy@linutronix.de>");

MODULE_DESCRIPTION("ot200 LED driver");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:leds-ot200");

CRA Git | Maintained and supported by SUSTech CRA and CCSE