Skip to content

Commit 3ad6822

Browse files
author
Alex Shi
committed
Merge tag 'v4.4.94' into linux-linaro-lsk-v4.4
 This is the 4.4.94 stable release
2 parents 218dea0 + af9a9a7 commit 3ad6822

54 files changed

Lines changed: 361 additions & 112 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION = 4
22
PATCHLEVEL = 4
3-
SUBLEVEL = 93
3+
SUBLEVEL = 94
44
EXTRAVERSION =
55
NAME = Blurry Fish Butt
66

‎arch/mips/include/asm/irq.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <irq.h>
1919

2020
#define IRQ_STACK_SIZE THREAD_SIZE
21-
#define IRQ_STACK_START (IRQ_STACK_SIZE - sizeof(unsigned long))
21+
#define IRQ_STACK_START (IRQ_STACK_SIZE - 16)
2222

2323
extern void *irq_stack[NR_CPUS];
2424

‎arch/sparc/include/asm/setup.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,11 @@ extern atomic_t dcpage_flushes;
5959
extern atomic_t dcpage_flushes_xcall;
6060

6161
extern int sysctl_tsb_ratio;
62-
#endif
6362

63+
#ifdef CONFIG_SERIAL_SUNHV
64+
void sunhv_migrate_hvcons_irq(int cpu);
65+
#endif
66+
#endif
6467
void sun_do_break(void);
6568
extern int stop_a_enabled;
6669
extern int scons_pwroff;

‎arch/sparc/kernel/smp_64.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1443,8 +1443,12 @@ void smp_send_stop(void)
14431443
int cpu;
14441444

14451445
if (tlb_type == hypervisor) {
1446+
int this_cpu = smp_processor_id();
1447+
#ifdef CONFIG_SERIAL_SUNHV
1448+
sunhv_migrate_hvcons_irq(this_cpu);
1449+
#endif
14461450
for_each_online_cpu(cpu) {
1447-
if (cpu == smp_processor_id())
1451+
if (cpu == this_cpu)
14481452
continue;
14491453
#ifdef CONFIG_SUN_LDOMS
14501454
if (ldom_domaining_enabled) {

‎block/bsg-lib.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ static int bsg_create_job(struct device *dev, struct request *req)
147147
failjob_rls_rqst_payload:
148148
kfree(job->request_payload.sg_list);
149149
failjob_rls_job:
150+
kfree(job);
150151
return -ENOMEM;
151152
}
152153

‎crypto/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@ config CRYPTO_XTS
343343
select CRYPTO_BLKCIPHER
344344
select CRYPTO_MANAGER
345345
select CRYPTO_GF128MUL
346+
select CRYPTO_ECB
346347
help
347348
XTS: IEEE1619/D16 narrow block cipher use with aes-xts-plain,
348349
key size 256, 384 or 512 bits. This implementation currently

‎drivers/cpufreq/Kconfig.arm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ config ARM_PXA2xx_CPUFREQ
241241

242242
config ACPI_CPPC_CPUFREQ
243243
tristate "CPUFreq driver based on the ACPI CPPC spec"
244-
depends on ACPI
244+
depends on ACPI_PROCESSOR
245245
select ACPI_CPPC_LIB
246246
default n
247247
help

‎drivers/gpu/drm/drm_dp_mst_topology.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1802,6 +1802,7 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr)
18021802
return -EINVAL;
18031803
}
18041804
req_payload.num_slots = mgr->proposed_vcpis[i]->num_slots;
1805+
req_payload.vcpi = mgr->proposed_vcpis[i]->vcpi;
18051806
} else {
18061807
port = NULL;
18071808
req_payload.num_slots = 0;
@@ -1817,6 +1818,7 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr)
18171818
if (req_payload.num_slots) {
18181819
drm_dp_create_payload_step1(mgr, mgr->proposed_vcpis[i]->vcpi, &req_payload);
18191820
mgr->payloads[i].num_slots = req_payload.num_slots;
1821+
mgr->payloads[i].vcpi = req_payload.vcpi;
18201822
} else if (mgr->payloads[i].num_slots) {
18211823
mgr->payloads[i].num_slots = 0;
18221824
drm_dp_destroy_payload_step1(mgr, port, mgr->payloads[i].vcpi, &mgr->payloads[i]);

‎drivers/i2c/busses/i2c-at91.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1131,6 +1131,7 @@ static int at91_twi_suspend_noirq(struct device *dev)
11311131

11321132
static int at91_twi_resume_noirq(struct device *dev)
11331133
{
1134+
struct at91_twi_dev *twi_dev = dev_get_drvdata(dev);
11341135
int ret;
11351136

11361137
if (!pm_runtime_status_suspended(dev)) {
@@ -1142,6 +1143,8 @@ static int at91_twi_resume_noirq(struct device *dev)
11421143
pm_runtime_mark_last_busy(dev);
11431144
pm_request_autosuspend(dev);
11441145

1146+
at91_init_twi_bus(twi_dev);
1147+
11451148
return 0;
11461149
}
11471150

‎drivers/iio/adc/xilinx-xadc-core.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,7 +1208,7 @@ static int xadc_probe(struct platform_device *pdev)
12081208

12091209
ret = xadc->ops->setup(pdev, indio_dev, irq);
12101210
if (ret)
1211-
goto err_free_samplerate_trigger;
1211+
goto err_clk_disable_unprepare;
12121212

12131213
ret = request_irq(irq, xadc->ops->interrupt_handler, 0,
12141214
dev_name(&pdev->dev), indio_dev);
@@ -1268,6 +1268,8 @@ static int xadc_probe(struct platform_device *pdev)
12681268

12691269
err_free_irq:
12701270
free_irq(irq, indio_dev);
1271+
err_clk_disable_unprepare:
1272+
clk_disable_unprepare(xadc->clk);
12711273
err_free_samplerate_trigger:
12721274
if (xadc->ops->flags & XADC_FLAGS_BUFFERED)
12731275
iio_trigger_free(xadc->samplerate_trigger);
@@ -1277,8 +1279,6 @@ static int xadc_probe(struct platform_device *pdev)
12771279
err_triggered_buffer_cleanup:
12781280
if (xadc->ops->flags & XADC_FLAGS_BUFFERED)
12791281
iio_triggered_buffer_cleanup(indio_dev);
1280-
err_clk_disable_unprepare:
1281-
clk_disable_unprepare(xadc->clk);
12821282
err_device_free:
12831283
kfree(indio_dev->channels);
12841284

0 commit comments

Comments
 (0)