diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-05-27 13:07:48 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-05-27 13:07:48 +1000 |
| commit | 7aae132983e87739ea9cd5ba096b3521cf1782ee (patch) | |
| tree | f4cd9413333f478ac5f2441c01f61aae5d0aae6b | |
| parent | b2988e369a083a124d4a7d1e572e0b7d4c7ddf91 (diff) | |
| parent | 91bcbb434c7f616b59d53d598887ed45b01397e6 (diff) | |
| download | linux-next-7aae132983e87739ea9cd5ba096b3521cf1782ee.tar.gz | |
Merge branch 'akpm/master'
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 | ||||
| -rw-r--r-- | fs/nfs/nfs4state.c | 4 | ||||
| -rw-r--r-- | mm/huge_memory.c | 3 |
3 files changed, 6 insertions, 4 deletions
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/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 5075592df145..f55a2cad7fb6 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -66,7 +66,9 @@ #define OPENOWNER_POOL_SIZE 8 const nfs4_stateid zero_stateid = { - .data = { 0 }, + { + .data = { 0 }, + }, .type = NFS4_SPECIAL_STATEID_TYPE, }; static DEFINE_MUTEX(nfs_clid_init_mutex); diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 9472fed5763e..152a3d2d401d 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -102,7 +102,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); @@ -706,6 +706,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 */ |