hardware/t100ha: Update to Linux 4.7.0

This reverts commit bafb5933654cdb7e35f0c54418bdd0dcb999f98c.

We can finally drop that patch, because the issue has been fixed
upstream already.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

2 files changed, 5 insertions, 91 deletions

diff --git a/modules/hardware/t100ha/default.nix b/modules/hardware/t100ha/default.nix
index cfd65552..303c56ab 100644
--- a/modules/hardware/t100ha/default.nix
+++ b/modules/hardware/t100ha/default.nix
@@ -14,15 +14,13 @@ in {
       nixpkgs = import ../../../nixpkgs-path.nix;
       mkKernel = import "${nixpkgs}/pkgs/os-specific/linux/kernel/generic.nix";
       t100haKernel = mkKernel rec {
-        version = "4.7-rc6";
-        modDirVersion = "4.7.0-rc6";
+        version = "4.7";
+        modDirVersion = "4.7.0";
         extraMeta.branch = "4.7";
 
-        src = pkgs.fetchgit {
-          url = "git://git.kernel.org/pub/scm/linux/kernel/git/"
-              + "torvalds/linux.git";
-          rev = "ee40fb2948fc99096836995d4f3ddcc0efbac790";
-          sha256 = "02mdw2wcghsrncrab77pznqx150w2r5jswxb5s71zmzq88bxc6h8";
+        src = pkgs.fetchurl {
+          url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
+          sha256 = "042z53ik3mqaqlfrn5b70kw882fwd42zanqld10s1vcs438w742i";
         };
 
         kernelPatches = [
@@ -32,9 +30,6 @@ in {
           { name = "meta-keys";
             patch = ./meta-keys.patch;
           }
-          { name = "revert-fix-acpica-namespace-interpreter-lock";
-            patch = ./revert-fix-acpica-namespace-interpreter-lock.patch;
-          }
         ];
 
         # Missing device drivers:
diff --git a/modules/hardware/t100ha/revert-fix-acpica-namespace-interpreter-lock.patch b/modules/hardware/t100ha/revert-fix-acpica-namespace-interpreter-lock.patch
deleted file mode 100644
index 1630d883..00000000
--- a/modules/hardware/t100ha/revert-fix-acpica-namespace-interpreter-lock.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git b/drivers/acpi/acpica/nsload.c a/drivers/acpi/acpica/nsload.c
-index 297f6aa..b5e2b0a 100644
---- b/drivers/acpi/acpica/nsload.c
-+++ a/drivers/acpi/acpica/nsload.c
-@@ -46,7 +46,6 @@
- #include "acnamesp.h"
- #include "acdispat.h"
- #include "actables.h"
--#include "acinterp.h"
- 
- #define _COMPONENT          ACPI_NAMESPACE
- ACPI_MODULE_NAME("nsload")
-@@ -79,8 +78,6 @@ acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node)
- 
- 	ACPI_FUNCTION_TRACE(ns_load_table);
- 
--	acpi_ex_enter_interpreter();
--
- 	/*
- 	 * Parse the table and load the namespace with all named
- 	 * objects found within. Control methods are NOT parsed
-@@ -92,7 +89,7 @@ acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node)
- 	 */
- 	status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
- 	if (ACPI_FAILURE(status)) {
--		goto unlock_interp;
-+		return_ACPI_STATUS(status);
- 	}
- 
- 	/* If table already loaded into namespace, just return */
-@@ -133,8 +130,6 @@ acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node)
- 
- unlock:
- 	(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
--unlock_interp:
--	(void)acpi_ex_exit_interpreter();
- 
- 	if (ACPI_FAILURE(status)) {
- 		return_ACPI_STATUS(status);
-diff --git b/drivers/acpi/acpica/nsparse.c a/drivers/acpi/acpica/nsparse.c
-index f631a47..1783cd7 100644
---- b/drivers/acpi/acpica/nsparse.c
-+++ a/drivers/acpi/acpica/nsparse.c
-@@ -47,6 +47,7 @@
- #include "acparser.h"
- #include "acdispat.h"
- #include "actables.h"
-+#include "acinterp.h"
- 
- #define _COMPONENT          ACPI_NAMESPACE
- ACPI_MODULE_NAME("nsparse")
-@@ -170,6 +171,8 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
- 
- 	ACPI_FUNCTION_TRACE(ns_parse_table);
- 
-+	acpi_ex_enter_interpreter();
-+
- 	/*
- 	 * AML Parse, pass 1
- 	 *
-@@ -185,7 +188,7 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
- 	status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS1,
- 					    table_index, start_node);
- 	if (ACPI_FAILURE(status)) {
--		return_ACPI_STATUS(status);
-+		goto error_exit;
- 	}
- 
- 	/*
-@@ -201,8 +204,10 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
- 	status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS2,
- 					    table_index, start_node);
- 	if (ACPI_FAILURE(status)) {
--		return_ACPI_STATUS(status);
-+		goto error_exit;
- 	}
- 
-+error_exit:
-+	acpi_ex_exit_interpreter();
- 	return_ACPI_STATUS(status);
- }