Merge branch 'akpm' (patches from Andrew)

Merge more updates from Andrew Morton:

 - a few block updates that fell in my lap

 - lib/ updates

 - checkpatch

 - autofs

 - ipc

 - a ton of misc other things

* emailed patches from Andrew Morton <[email protected]>: (100 commits)
  mm: split gfp_mask and mapping flags into separate fields
  fs: use mapping_set_error instead of opencoded set_bit
  treewide: remove redundant #include <linux/kconfig.h>
  hung_task: allow hung_task_panic when hung_task_warnings is 0
  kthread: add kerneldoc for kthread_create()
  kthread: better support freezable kthread workers
  kthread: allow to modify delayed kthread work
  kthread: allow to cancel kthread work
  kthread: initial support for delayed kthread work
  kthread: detect when a kthread work is used by more workers
  kthread: add kthread_destroy_worker()
  kthread: add kthread_create_worker*()
  kthread: allow to call __kthread_create_on_node() with va_list args
  kthread/smpboot: do not park in kthread_create_on_cpu()
  kthread: kthread worker API cleanup
  kthread: rename probe_kthread_data() to kthread_probe_data()
  scripts/tags.sh: enable code completion in VIM
  mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping
  kdump, vmcoreinfo: report memory sections virtual addresses
  ipc/sem.c: add cond_resched in exit_sme
  ...
This commit is contained in:
Linus Torvalds 2016-10-11 17:34:10 -07:00
commit a379f71a30
200 changed files with 2300 additions and 1061 deletions

View file

@ -25,7 +25,6 @@
#ifndef AF9013_H
#define AF9013_H
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
/* AF9013/5 GPIOs (mostly guessed)

View file

@ -22,8 +22,6 @@
#ifndef AF9033_H
#define AF9033_H
#include <linux/kconfig.h>
/*
* I2C address (TODO: are these in 8-bit format?)
* 0x38, 0x3a, 0x3c, 0x3e

View file

@ -22,7 +22,6 @@
#ifndef __DVB_ASCOT2E_H__
#define __DVB_ASCOT2E_H__
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
#include <linux/i2c.h>

View file

@ -22,7 +22,6 @@
#ifndef __ATBM8830_H__
#define __ATBM8830_H__
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
#include <linux/i2c.h>

View file

@ -22,7 +22,6 @@
#ifndef __AU8522_H__
#define __AU8522_H__
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
enum au8522_if_freq {

View file

@ -28,7 +28,6 @@
#ifndef CX22702_H
#define CX22702_H
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
struct cx22702_config {

View file

@ -22,8 +22,6 @@
#ifndef CX24113_H
#define CX24113_H
#include <linux/kconfig.h>
struct dvb_frontend;
struct cx24113_config {

View file

@ -21,7 +21,6 @@
#ifndef CX24116_H
#define CX24116_H
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
struct cx24116_config {

View file

@ -22,7 +22,6 @@
#ifndef CX24117_H
#define CX24117_H
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
struct cx24117_config {

View file

@ -20,7 +20,6 @@
#ifndef CX24120_H
#define CX24120_H
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
#include <linux/firmware.h>

View file

@ -21,7 +21,6 @@
#ifndef CX24123_H
#define CX24123_H
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
struct cx24123_config {

View file

@ -22,7 +22,6 @@
#ifndef CXD2820R_H
#define CXD2820R_H
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
#define CXD2820R_GPIO_D (0 << 0) /* disable */

View file

@ -22,7 +22,6 @@
#ifndef CXD2841ER_H
#define CXD2841ER_H
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
enum cxd2841er_xtal {

View file

@ -13,8 +13,6 @@
#ifndef DIB3000MC_H
#define DIB3000MC_H
#include <linux/kconfig.h>
#include "dibx000_common.h"
struct dib3000mc_config {

View file

@ -1,8 +1,6 @@
#ifndef DIB7000M_H
#define DIB7000M_H
#include <linux/kconfig.h>
#include "dibx000_common.h"
struct dib7000m_config {

View file

@ -1,8 +1,6 @@
#ifndef DIB7000P_H
#define DIB7000P_H
#include <linux/kconfig.h>
#include "dibx000_common.h"
struct dib7000p_config {

View file

@ -24,7 +24,6 @@
#ifndef _DRXD_H_
#define _DRXD_H_
#include <linux/kconfig.h>
#include <linux/types.h>
#include <linux/i2c.h>

View file

@ -1,7 +1,6 @@
#ifndef _DRXK_H_
#define _DRXK_H_
#include <linux/kconfig.h>
#include <linux/types.h>
#include <linux/i2c.h>

View file

@ -22,7 +22,6 @@
#ifndef DS3000_H
#define DS3000_H
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
struct ds3000_config {

View file

@ -22,7 +22,6 @@
#ifndef DVB_DUMMY_FE_H
#define DVB_DUMMY_FE_H
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
#include "dvb_frontend.h"

View file

@ -22,7 +22,6 @@
#ifndef EC100_H
#define EC100_H
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
struct ec100_config {

View file

@ -23,7 +23,6 @@
#ifndef HD29L2_H
#define HD29L2_H
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
struct hd29l2_config {

View file

@ -21,7 +21,6 @@
#ifndef __DVB_HELENE_H__
#define __DVB_HELENE_H__
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
#include <linux/i2c.h>

View file

@ -22,7 +22,6 @@
#ifndef __DVB_HORUS3A_H__
#define __DVB_HORUS3A_H__
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
#include <linux/i2c.h>

View file

@ -20,7 +20,6 @@
#ifndef DVB_IX2505V_H
#define DVB_IX2505V_H
#include <linux/kconfig.h>
#include <linux/i2c.h>
#include "dvb_frontend.h"

View file

@ -22,7 +22,6 @@
#ifndef _LG2160_H_
#define _LG2160_H_
#include <linux/kconfig.h>
#include <linux/i2c.h>
#include "dvb_frontend.h"

View file

@ -22,7 +22,6 @@
#ifndef _LGDT3305_H_
#define _LGDT3305_H_
#include <linux/kconfig.h>
#include <linux/i2c.h>
#include "dvb_frontend.h"

View file

@ -23,7 +23,6 @@
#ifndef LGS8GL5_H
#define LGS8GL5_H
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
struct lgs8gl5_config {

View file

@ -26,7 +26,6 @@
#ifndef __LGS8GXX_H__
#define __LGS8GXX_H__
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
#include <linux/i2c.h>

View file

@ -23,8 +23,6 @@
#ifndef _LNBH24_H
#define _LNBH24_H
#include <linux/kconfig.h>
/* system register bits */
#define LNBH24_OLF 0x01
#define LNBH24_OTF 0x02

View file

@ -22,7 +22,6 @@
#define LNBH25_H
#include <linux/i2c.h>
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
/* 22 kHz tone enabled. Tone output controlled by DSQIN pin */

View file

@ -27,8 +27,6 @@
#ifndef _LNBP21_H
#define _LNBP21_H
#include <linux/kconfig.h>
/* system register bits */
/* [RO] 0=OK; 1=over current limit flag */
#define LNBP21_OLF 0x01

View file

@ -28,8 +28,6 @@
#ifndef _LNBP22_H
#define _LNBP22_H
#include <linux/kconfig.h>
/* Enable */
#define LNBP22_EN 0x10
/* Voltage selection */

View file

@ -20,7 +20,6 @@
#ifndef M88RS2000_H
#define M88RS2000_H
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
#include "dvb_frontend.h"

View file

@ -16,7 +16,6 @@
#ifndef MB86A20S_H
#define MB86A20S_H
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
/**

View file

@ -22,7 +22,6 @@
#ifndef __S5H1409_H__
#define __S5H1409_H__
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
struct s5h1409_config {

View file

@ -22,7 +22,6 @@
#ifndef __S5H1411_H__
#define __S5H1411_H__
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
#define S5H1411_I2C_TOP_ADDR (0x32 >> 1)

View file

@ -22,7 +22,6 @@
#ifndef __S5H1432_H__
#define __S5H1432_H__
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
#define S5H1432_I2C_TOP_ADDR (0x02 >> 1)

View file

@ -17,7 +17,6 @@
#ifndef S921_H
#define S921_H
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
struct s921_config {

View file

@ -1,7 +1,6 @@
#ifndef SI21XX_H
#define SI21XX_H
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
#include "dvb_frontend.h"

View file

@ -17,7 +17,6 @@
#ifndef SP2_H
#define SP2_H
#include <linux/kconfig.h>
#include "dvb_ca_en50221.h"
/*

View file

@ -23,7 +23,6 @@
#ifndef __DVB_STB6000_H__
#define __DVB_STB6000_H__
#include <linux/kconfig.h>
#include <linux/i2c.h>
#include "dvb_frontend.h"

View file

@ -27,7 +27,6 @@
#ifndef STV0288_H
#define STV0288_H
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
#include "dvb_frontend.h"

View file

@ -26,7 +26,6 @@
#ifndef STV0367_H
#define STV0367_H
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
#include "dvb_frontend.h"

View file

@ -26,7 +26,6 @@
#ifndef STV0900_H
#define STV0900_H
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
#include "dvb_frontend.h"

View file

@ -25,7 +25,6 @@
#ifndef __DVB_STV6110_H__
#define __DVB_STV6110_H__
#include <linux/kconfig.h>
#include <linux/i2c.h>
#include "dvb_frontend.h"

View file

@ -22,7 +22,6 @@
#ifndef TDA10048_H
#define TDA10048_H
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
#include <linux/firmware.h>

View file

@ -1,8 +1,6 @@
#ifndef _TDA18271C2DD_H_
#define _TDA18271C2DD_H_
#include <linux/kconfig.h>
#if IS_REACHABLE(CONFIG_DVB_TDA18271C2DD)
struct dvb_frontend *tda18271c2dd_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c, u8 adr);

View file

@ -22,7 +22,6 @@
#ifndef TS2020_H
#define TS2020_H
#include <linux/kconfig.h>
#include <linux/dvb/frontend.h>
struct ts2020_config {

View file

@ -21,7 +21,6 @@
#ifndef DVB_ZL10036_H
#define DVB_ZL10036_H
#include <linux/kconfig.h>
#include <linux/i2c.h>
#include "dvb_frontend.h"

View file

@ -22,8 +22,6 @@
#ifndef ZL10039_H
#define ZL10039_H
#include <linux/kconfig.h>
#if IS_REACHABLE(CONFIG_DVB_ZL10039)
struct dvb_frontend *zl10039_attach(struct dvb_frontend *fe,
u8 i2c_addr,

View file

@ -20,8 +20,6 @@
#ifndef __ALTERA_CI_H
#define __ALTERA_CI_H
#include <linux/kconfig.h>
#define ALT_DATA 0x000000ff
#define ALT_TDI 0x00008000
#define ALT_TDO 0x00004000

View file

@ -750,7 +750,7 @@ static int ivtv_init_struct1(struct ivtv *itv)
spin_lock_init(&itv->lock);
spin_lock_init(&itv->dma_reg_lock);
init_kthread_worker(&itv->irq_worker);
kthread_init_worker(&itv->irq_worker);
itv->irq_worker_task = kthread_run(kthread_worker_fn, &itv->irq_worker,
"%s", itv->v4l2_dev.name);
if (IS_ERR(itv->irq_worker_task)) {
@ -760,7 +760,7 @@ static int ivtv_init_struct1(struct ivtv *itv)
/* must use the FIFO scheduler as it is realtime sensitive */
sched_setscheduler(itv->irq_worker_task, SCHED_FIFO, &param);
init_kthread_work(&itv->irq_work, ivtv_irq_work_handler);
kthread_init_work(&itv->irq_work, ivtv_irq_work_handler);
/* Initial settings */
itv->cxhdl.port = CX2341X_PORT_MEMORY;
@ -1441,7 +1441,7 @@ static void ivtv_remove(struct pci_dev *pdev)
del_timer_sync(&itv->dma_timer);
/* Kill irq worker */
flush_kthread_worker(&itv->irq_worker);
kthread_flush_worker(&itv->irq_worker);
kthread_stop(itv->irq_worker_task);
ivtv_streams_cleanup(itv);

View file

@ -1062,7 +1062,7 @@ irqreturn_t ivtv_irq_handler(int irq, void *dev_id)
}
if (test_and_clear_bit(IVTV_F_I_HAVE_WORK, &itv->i_flags)) {
queue_kthread_work(&itv->irq_worker, &itv->irq_work);
kthread_queue_work(&itv->irq_worker, &itv->irq_work);
}
spin_unlock(&itv->dma_reg_lock);

View file

@ -1,7 +1,6 @@
#ifndef LINUX_FC0011_H_
#define LINUX_FC0011_H_
#include <linux/kconfig.h>
#include "dvb_frontend.h"

View file

@ -21,7 +21,6 @@
#ifndef _FC0012_H_
#define _FC0012_H_
#include <linux/kconfig.h>
#include "dvb_frontend.h"
#include "fc001x-common.h"

View file

@ -22,7 +22,6 @@
#ifndef _FC0013_H_
#define _FC0013_H_
#include <linux/kconfig.h>
#include "dvb_frontend.h"
#include "fc001x-common.h"

View file

@ -22,8 +22,6 @@
#ifndef __MAX2165_H__
#define __MAX2165_H__
#include <linux/kconfig.h>
struct dvb_frontend;
struct i2c_adapter;

View file

@ -22,8 +22,6 @@
#ifndef MC44S803_H
#define MC44S803_H
#include <linux/kconfig.h>
struct dvb_frontend;
struct i2c_adapter;

View file

@ -23,8 +23,6 @@
#ifndef __MXL5005S_H
#define __MXL5005S_H
#include <linux/kconfig.h>
#include <linux/i2c.h>
#include "dvb_frontend.h"

View file

@ -21,7 +21,6 @@
#ifndef R820T_H
#define R820T_H
#include <linux/kconfig.h>
#include "dvb_frontend.h"
enum r820t_chip {

View file

@ -17,7 +17,6 @@
#ifndef SI2157_H
#define SI2157_H
#include <linux/kconfig.h>
#include <media/media-device.h>
#include "dvb_frontend.h"

View file

@ -21,7 +21,6 @@
#ifndef TDA18212_H
#define TDA18212_H
#include <linux/kconfig.h>
#include "dvb_frontend.h"
struct tda18212_config {

View file

@ -21,7 +21,6 @@
#ifndef TDA18218_H
#define TDA18218_H
#include <linux/kconfig.h>
#include "dvb_frontend.h"
struct tda18218_config {

View file

@ -22,7 +22,6 @@
#ifndef __XC5000_H__
#define __XC5000_H__
#include <linux/kconfig.h>
#include <linux/firmware.h>
struct dvb_frontend;

View file

@ -21,7 +21,6 @@
#ifndef __MXL111SF_DEMOD_H__
#define __MXL111SF_DEMOD_H__
#include <linux/kconfig.h>
#include "dvb_frontend.h"
#include "mxl111sf.h"

View file

@ -21,7 +21,6 @@
#ifndef __MXL111SF_TUNER_H__
#define __MXL111SF_TUNER_H__
#include <linux/kconfig.h>
#include "dvb_frontend.h"
#include "mxl111sf.h"

View file

@ -9,7 +9,6 @@
* see Documentation/dvb/README.dvb-usb for more information
*/
#include <linux/kconfig.h>
#include "dibusb.h"
/* Max transfer size done by I2C transfer functions */

View file

@ -10,7 +10,6 @@
*/
#include <linux/kernel.h>
#include <linux/kconfig.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/slab.h>