Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fc543c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] IOSAPIC bogus error cleanup
  [IA64] Update printing of feature set bits
  [IA64] Fix IOSAPIC delivery mode setting
  [IA64] XPC heartbeat timer function must run on CPU 0
  [IA64] Clean up /proc/interrupts output
  [IA64] Disable/re-enable CPE interrupts on Altix
  [IA64] Clean-up McKinley Errata message
  [IA64] Add gate.lds to list of files ignored by Git
  [IA64] Fix section mismatch in contig.c version of per_cpu_init()
  [IA64] Wrong args to memset in efi_gettimeofday()
  [IA64] Remove duplicate includes from ia32priv.h
  [IA64] fix number of bytes zeroed by sys_fw_init() in arch/ia64/hp/sim/boot/fw-emu.c
  [IA64] Fix perfmon sysctl directory modes
parents a70a9322 7f6ff62a

arch/ia64/hp/sim/boot/fw-emu.c

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ sys_fw_init (const char *args, int arglen) 
	}

	cmd_line[arglen] = '\0';



	memset(efi_systab, 0, sizeof(efi_systab));

	memset(efi_systab, 0, sizeof(*efi_systab));

	efi_systab->hdr.signature = EFI_SYSTEM_TABLE_SIGNATURE;

	efi_systab->hdr.revision  = ((1 << 16) | 00);

	efi_systab->hdr.headersize = sizeof(efi_systab->hdr);

arch/ia64/ia32/ia32priv.h

+0 −1
Original line number Diff line number Diff line
@@ -290,7 +290,6 @@ struct old_linux32_dirent { 
#define _ASM_IA64_ELF_H		/* Don't include elf.h */



#include <linux/sched.h>

#include <asm/processor.h>



/*

 * This is used to ensure we don't load something for the wrong architecture.

arch/ia64/kernel/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
gate.lds

arch/ia64/kernel/acpi.c

+5 −3
Original line number Diff line number Diff line
@@ -678,9 +678,11 @@ int __init acpi_boot_init(void) 
	/* I/O APIC */



	if (acpi_table_parse_madt

	    (ACPI_MADT_TYPE_IO_SAPIC, acpi_parse_iosapic, NR_IOSAPICS) < 1)

	    (ACPI_MADT_TYPE_IO_SAPIC, acpi_parse_iosapic, NR_IOSAPICS) < 1) {

		if (!ia64_platform_is("sn2"))

			printk(KERN_ERR PREFIX

			       "Error parsing MADT - no IOSAPIC entries\n");

	}



	/* System-Level Interrupt Routing */

arch/ia64/kernel/efi.c

+3 −2
Original line number Diff line number Diff line
@@ -218,9 +218,10 @@ efi_gettimeofday (struct timespec *ts) 
{

	efi_time_t tm;



	memset(ts, 0, sizeof(ts));

	if ((*efi.get_time)(&tm, NULL) != EFI_SUCCESS)

	if ((*efi.get_time)(&tm, NULL) != EFI_SUCCESS) {

		memset(ts, 0, sizeof(*ts));

		return;

	}



	ts->tv_sec = mktime(tm.year, tm.month, tm.day, tm.hour, tm.minute, tm.second);

	ts->tv_nsec = tm.nanosecond;