merge linus into test branch (9774f338) · Commits · e / devices / android_kernel_xiaomi_nabu

Documentation/DocBook/genericirq.tmpl

+2 −2

Original line number	Diff line number	Diff line
		@@ -303,10 +303,10 @@ desc->status \|= running;
		do {
		if (desc->status & masked)
		desc->chip->enable();
		desc-status &= ~pending;
		desc->status &= ~pending;
		handle_IRQ_event(desc->action);
		} while (status & pending);
		desc-status &= ~running;
		desc->status &= ~running;
		desc->chip->end();
		</programlisting>
		</para>

MAINTAINERS

+6 −0

Original line number	Diff line number	Diff line
		@@ -1277,6 +1277,12 @@ L: linux-nvidia@lists.surfsouth.com
		W: http://drama.obuda.kando.hu/~fero/cgi-bin/hgafb.shtml
		S: Maintained

		HID CORE LAYER
		P: Jiri Kosina
		M: jkosina@suse.cz
		L: linux-input@atrey.karlin.mff.cuni.cz
		S: Maintained

		HIGH-SPEED SCC DRIVER FOR AX.25
		P: Klaus Kudielka
		M: klaus.kudielka@ieee.org

Makefile

+0 −5

Original line number	Diff line number	Diff line
		@@ -496,11 +496,6 @@ else
		CFLAGS += -fomit-frame-pointer
		endif

		ifdef CONFIG_UNWIND_INFO
		CFLAGS += -fasynchronous-unwind-tables
		LDFLAGS_vmlinux += --eh-frame-hdr
		endif

		ifdef CONFIG_DEBUG_INFO
		CFLAGS += -g
		endif

arch/i386/defconfig

+0 −2

Original line number	Diff line number	Diff line
		@@ -1493,8 +1493,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
		# CONFIG_DEBUG_VM is not set
		# CONFIG_DEBUG_LIST is not set
		# CONFIG_FRAME_POINTER is not set
		CONFIG_UNWIND_INFO=y
		CONFIG_STACK_UNWIND=y
		# CONFIG_FORCED_INLINING is not set
		# CONFIG_HEADERS_CHECK is not set
		# CONFIG_RCU_TORTURE_TEST is not set

arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c

+8 −25

Original line number	Diff line number	Diff line
		@@ -126,27 +126,6 @@ static unsigned extract_freq(u32 val, struct acpi_cpufreq_data *data)
		}
		}

		static void wrport(u16 port, u8 bit_width, u32 value)
		{
		if (bit_width <= 8)
		outb(value, port);
		else if (bit_width <= 16)
		outw(value, port);
		else if (bit_width <= 32)
		outl(value, port);
		}

		static void rdport(u16 port, u8 bit_width, u32 * ret)
		{
		*ret = 0;
		if (bit_width <= 8)
		*ret = inb(port);
		else if (bit_width <= 16)
		*ret = inw(port);
		else if (bit_width <= 32)
		*ret = inl(port);
		}

		struct msr_addr {
		u32 reg;
		};
		@@ -177,7 +156,9 @@ static void do_drv_read(struct drv_cmd *cmd)
		rdmsr(cmd->addr.msr.reg, cmd->val, h);
		break;
		case SYSTEM_IO_CAPABLE:
		rdport(cmd->addr.io.port, cmd->addr.io.bit_width, &cmd->val);
		acpi_os_read_port((acpi_io_address)cmd->addr.io.port,
		&cmd->val,
		(u32)cmd->addr.io.bit_width);
		break;
		default:
		break;
		@@ -193,7 +174,9 @@ static void do_drv_write(struct drv_cmd *cmd)
		wrmsr(cmd->addr.msr.reg, cmd->val, h);
		break;
		case SYSTEM_IO_CAPABLE:
		wrport(cmd->addr.io.port, cmd->addr.io.bit_width, cmd->val);
		acpi_os_write_port((acpi_io_address)cmd->addr.io.port,
		cmd->val,
		(u32)cmd->addr.io.bit_width);
		break;
		default:
		break;
		@@ -699,14 +682,14 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
		if (result)
		goto err_freqfree;

		switch (data->cpu_feature) {
		switch (perf->control_register.space_id) {
		case ACPI_ADR_SPACE_SYSTEM_IO:
		/* Current speed is unknown and not detectable by IO port */
		policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
		break;
		case ACPI_ADR_SPACE_FIXED_HARDWARE:
		acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
		get_cur_freq_on_cpu(cpu);
		policy->cur = get_cur_freq_on_cpu(cpu);
		break;
		default:
		break;