Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ (ebf4d8ec) · Commits · e / devices / android_kernel_xiaomi_markw

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 2
		PATCHLEVEL = 6
		SUBLEVEL = 20
		EXTRAVERSION =-rc7
		EXTRAVERSION =
		NAME = Homicidal Dwarf Hamster

		# DOCUMENTATION

arch/i386/kernel/efi.c

+73 −16

Original line number	Diff line number	Diff line
		@@ -472,6 +472,70 @@ static inline void __init check_range_for_systab(efi_memory_desc_t *md)
		}
		}

		/*
		* Wrap all the virtual calls in a way that forces the parameters on the stack.
		*/

		#define efi_call_virt(f, args...) \
		((efi_##f##_t __attribute__((regparm(0)))*)efi.systab->runtime->f)(args)

		static efi_status_t virt_efi_get_time(efi_time_t tm, efi_time_cap_t tc)
		{
		return efi_call_virt(get_time, tm, tc);
		}

		static efi_status_t virt_efi_set_time (efi_time_t *tm)
		{
		return efi_call_virt(set_time, tm);
		}

		static efi_status_t virt_efi_get_wakeup_time (efi_bool_t *enabled,
		efi_bool_t *pending,
		efi_time_t *tm)
		{
		return efi_call_virt(get_wakeup_time, enabled, pending, tm);
		}

		static efi_status_t virt_efi_set_wakeup_time (efi_bool_t enabled,
		efi_time_t *tm)
		{
		return efi_call_virt(set_wakeup_time, enabled, tm);
		}

		static efi_status_t virt_efi_get_variable (efi_char16_t *name,
		efi_guid_t vendor, u32 attr,
		unsigned long data_size, void data)
		{
		return efi_call_virt(get_variable, name, vendor, attr, data_size, data);
		}

		static efi_status_t virt_efi_get_next_variable (unsigned long *name_size,
		efi_char16_t *name,
		efi_guid_t *vendor)
		{
		return efi_call_virt(get_next_variable, name_size, name, vendor);
		}

		static efi_status_t virt_efi_set_variable (efi_char16_t *name,
		efi_guid_t *vendor,
		unsigned long attr,
		unsigned long data_size, void *data)
		{
		return efi_call_virt(set_variable, name, vendor, attr, data_size, data);
		}

		static efi_status_t virt_efi_get_next_high_mono_count (u32 *count)
		{
		return efi_call_virt(get_next_high_mono_count, count);
		}

		static void virt_efi_reset_system (int reset_type, efi_status_t status,
		unsigned long data_size,
		efi_char16_t *data)
		{
		efi_call_virt(reset_system, reset_type, status, data_size, data);
		}

		/*
		* This function will switch the EFI runtime services to virtual mode.
		* Essentially, look through the EFI memmap and map every region that
		@@ -525,22 +589,15 @@ void __init efi_enter_virtual_mode(void)
		* pointers in the runtime service table to the new virtual addresses.
		*/

		efi.get_time = (efi_get_time_t *) efi.systab->runtime->get_time;
		efi.set_time = (efi_set_time_t *) efi.systab->runtime->set_time;
		efi.get_wakeup_time = (efi_get_wakeup_time_t *)
		efi.systab->runtime->get_wakeup_time;
		efi.set_wakeup_time = (efi_set_wakeup_time_t *)
		efi.systab->runtime->set_wakeup_time;
		efi.get_variable = (efi_get_variable_t *)
		efi.systab->runtime->get_variable;
		efi.get_next_variable = (efi_get_next_variable_t *)
		efi.systab->runtime->get_next_variable;
		efi.set_variable = (efi_set_variable_t *)
		efi.systab->runtime->set_variable;
		efi.get_next_high_mono_count = (efi_get_next_high_mono_count_t *)
		efi.systab->runtime->get_next_high_mono_count;
		efi.reset_system = (efi_reset_system_t *)
		efi.systab->runtime->reset_system;
		efi.get_time = virt_efi_get_time;
		efi.set_time = virt_efi_set_time;
		efi.get_wakeup_time = virt_efi_get_wakeup_time;
		efi.set_wakeup_time = virt_efi_set_wakeup_time;
		efi.get_variable = virt_efi_get_variable;
		efi.get_next_variable = virt_efi_get_next_variable;
		efi.set_variable = virt_efi_set_variable;
		efi.get_next_high_mono_count = virt_efi_get_next_high_mono_count;
		efi.reset_system = virt_efi_reset_system;
		}

		void __init

drivers/usb/net/rtl8150.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -284,7 +284,8 @@ static int write_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 reg)
		u8 data[3], tmp;

		data[0] = phy;
		*(data + 1) = cpu_to_le16p(&reg);
		data[1] = reg & 0xff;
		data[2] = (reg >> 8) & 0xff;
		tmp = indx \| PHY_WRITE \| PHY_GO;
		i = 0;