diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-05-30 12:49:49 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-05-30 12:49:49 +1000 |
| commit | efe5226c12da840c037f83f62b033a15ad593f90 (patch) | |
| tree | 0827790bd6d7255950ee06ae456e711ea6cd39aa | |
| parent | c36cdc11c3bd0c871ad1415ba51d92073bf58493 (diff) | |
| parent | 8261089741cd61f3a3c9f0bd2601794f197d64de (diff) | |
| download | linux-next-efe5226c12da840c037f83f62b033a15ad593f90.tar.gz | |
Merge branch 'akpm/master'
| -rw-r--r-- | drivers/fpga/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 | ||||
| -rw-r--r-- | mm/huge_memory.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig index c9b9fdf6cfbb..d61410299ec0 100644 --- a/drivers/fpga/Kconfig +++ b/drivers/fpga/Kconfig @@ -21,6 +21,7 @@ config FPGA_MGR_SOCFPGA config FPGA_MGR_ZYNQ_FPGA tristate "Xilinx Zynq FPGA" + depends on HAS_DMA help FPGA manager driver support for Xilinx Zynq FPGAs. diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/calib.c b/drivers/net/wireless/intel/iwlwifi/dvm/calib.c index e9cef9de9ed8..c96f9b1d948a 100644 --- a/drivers/net/wireless/intel/iwlwifi/dvm/calib.c +++ b/drivers/net/wireless/intel/iwlwifi/dvm/calib.c @@ -900,8 +900,7 @@ static void iwlagn_gain_computation(struct iwl_priv *priv, /* bound gain by 2 bits value max, 3rd bit is sign */ data->delta_gain_code[i] = - min(abs(delta_g), - (s32) CHAIN_NOISE_MAX_DELTA_GAIN_CODE); + min(abs(delta_g), CHAIN_NOISE_MAX_DELTA_GAIN_CODE); if (delta_g < 0) /* diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 77a348084ebd..292cedd9d692 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -101,7 +101,7 @@ static DECLARE_WAIT_QUEUE_HEAD(khugepaged_wait); * fault. */ static unsigned int khugepaged_max_ptes_none __read_mostly; -static unsigned int khugepaged_max_ptes_swap __read_mostly = HPAGE_PMD_NR/8; +static unsigned int khugepaged_max_ptes_swap __read_mostly; static unsigned long allocstall; static int khugepaged(void *none); @@ -705,6 +705,7 @@ static int __init hugepage_init(void) khugepaged_pages_to_scan = HPAGE_PMD_NR * 8; khugepaged_max_ptes_none = HPAGE_PMD_NR - 1; + khugepaged_max_ptes_swap = HPAGE_PMD_NR / 8; /* * hugepages can't be allocated by the buddy allocator */ |