release v4.10-5

raphael · Mar 20, 2017 · f668fed · f668fed
1 parent 9b3536e
commit f668fed
Show file tree

Hide file tree

Showing 72 changed files with 539 additions and 321 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+v4.10-5 2017-03-20
+--------------------
+Update to Linux 4.10.4
+Enable `CONFIG_MAGIC_SYSRQ` (see #189)
+
 v4.10-4 2017-03-15
 --------------------
 Update to Linux 4.10.3

diff --git a/aur/PKGBUILD b/aur/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase=linux-samus4
 pkgver=4.10
-pkgrel=4
+pkgrel=5
 arch=('x86_64')
 url="https://github.com/raphael/linux-samus"
 license=('GPL2')

diff --git a/build/CHANGELOG b/build/CHANGELOG
diff --git a/...nux/linux-samus4-4.10-4-x86_64.pkg.tar.xz → ...nux/linux-samus4-4.10-5-x86_64.pkg.tar.xz b/...nux/linux-samus4-4.10-4-x86_64.pkg.tar.xz → ...nux/linux-samus4-4.10-5-x86_64.pkg.tar.xz
diff --git a/build/archlinux/linux-samus4-docs-4.10-4-x86_64.pkg.tar.xz b/build/archlinux/linux-samus4-docs-4.10-4-x86_64.pkg.tar.xz
diff --git a/build/archlinux/linux-samus4-docs-4.10-5-x86_64.pkg.tar.xz b/build/archlinux/linux-samus4-docs-4.10-5-x86_64.pkg.tar.xz
diff --git a/...x-samus4-headers-4.10-4-x86_64.pkg.tar.xz → ...x-samus4-headers-4.10-5-x86_64.pkg.tar.xz b/...x-samus4-headers-4.10-4-x86_64.pkg.tar.xz → ...x-samus4-headers-4.10-5-x86_64.pkg.tar.xz
diff --git a/build/debian/linux-firmware-image-4.10.3-ph+_4.10.3-ph+-6_amd64.deb b/build/debian/linux-firmware-image-4.10.3-ph+_4.10.3-ph+-6_amd64.deb
diff --git a/build/debian/linux-firmware-image-4.10.4-ph+_4.10.4-ph+-8_amd64.deb b/build/debian/linux-firmware-image-4.10.4-ph+_4.10.4-ph+-8_amd64.deb
diff --git a/...headers-4.10.3-ph+_4.10.3-ph+-6_amd64.deb → ...headers-4.10.4-ph+_4.10.4-ph+-8_amd64.deb b/...headers-4.10.3-ph+_4.10.3-ph+-6_amd64.deb → ...headers-4.10.4-ph+_4.10.4-ph+-8_amd64.deb
diff --git a/...x-image-4.10.3-ph+_4.10.3-ph+-6_amd64.deb → ...x-image-4.10.4-ph+_4.10.4-ph+-8_amd64.deb b/...x-image-4.10.3-ph+_4.10.3-ph+-6_amd64.deb → ...x-image-4.10.4-ph+_4.10.4-ph+-8_amd64.deb
diff --git a/build/debian/linux-libc-dev_4.10.3-ph+-6_amd64.deb b/build/debian/linux-libc-dev_4.10.3-ph+-6_amd64.deb
diff --git a/build/debian/linux-libc-dev_4.10.4-ph+-8_amd64.deb b/build/debian/linux-libc-dev_4.10.4-ph+-8_amd64.deb
diff --git a/build/linux-4.10.4-ph+_4.10.4-ph+-8.dsc b/build/linux-4.10.4-ph+_4.10.4-ph+-8.dsc
@@ -0,0 +1,23 @@
+Format: 3.0 (quilt)
+Source: linux-4.10.4-ph+
+Binary: linux-image-4.10.4-ph+, linux-headers-4.10.4-ph+, linux-firmware-image-4.10.4-ph+, linux-libc-dev
+Architecture: any all
+Version: 4.10.4-ph+-8
+Maintainer: Anonymous <[email protected]>
+Homepage: http://www.kernel.org/
+Standards-Version: 3.8.4
+Build-Depends: bc, kmod, cpio
+Package-List:
+ linux-firmware-image-4.10.4-ph+ deb kernel optional arch=all
+ linux-headers-4.10.4-ph+ deb kernel optional arch=any
+ linux-image-4.10.4-ph+ deb kernel optional arch=any
+ linux-libc-dev deb devel optional arch=any
+Checksums-Sha1:
+ 0159a8d2ba5e352a158311c46c12b50d7b8001d9 305171437 linux-4.10.4-ph+_4.10.4-ph+.orig.tar.gz
+ 46b9b30ca979771904ed111cf1ea49fa3a1ea449 1289 linux-4.10.4-ph+_4.10.4-ph+-8.debian.tar.gz
+Checksums-Sha256:
+ 9a3a1037ed0e808b77c135197e7798303d55145cdc9fe2fe91aba5804cf6fb44 305171437 linux-4.10.4-ph+_4.10.4-ph+.orig.tar.gz
+ 4f07681d57c6c5c7f682d7f55791cfbeee4bfbfc360f324f2e0e4c79fe70b706 1289 linux-4.10.4-ph+_4.10.4-ph+-8.debian.tar.gz
+Files:
+ 7ff8af116b6af6bdb442eed0a53bb882 305171437 linux-4.10.4-ph+_4.10.4-ph+.orig.tar.gz
+ 8db86fcea019c3c2e37f4c3bf2b85f66 1289 linux-4.10.4-ph+_4.10.4-ph+-8.debian.tar.gz
diff --git a/build/linux-4.10.4-ph+_4.10.4-ph+-8_amd64.changes b/build/linux-4.10.4-ph+_4.10.4-ph+-8_amd64.changes
@@ -0,0 +1,43 @@
+Format: 1.8
+Date: Sun, 19 Mar 2017 23:38:18 -0700
+Source: linux-4.10.4-ph+
+Binary: linux-image-4.10.4-ph+ linux-headers-4.10.4-ph+ linux-firmware-image-4.10.4-ph+ linux-libc-dev
+Architecture: source amd64 all
+Version: 4.10.4-ph+-8
+Distribution: vivid
+Urgency: low
+Maintainer: Anonymous <[email protected]>
+Changed-By: Anonymous <[email protected]>
+Description:
+ linux-firmware-image-4.10.4-ph+ - Linux kernel firmware, version 4.10.4-ph+
+ linux-headers-4.10.4-ph+ - Linux kernel headers for 4.10.4-ph+ on ${kernel:debarch}
+ linux-image-4.10.4-ph+ - Linux kernel, version 4.10.4-ph+
+ linux-libc-dev - Linux support headers for userspace development
+Changes:
+ linux-4.10.4-ph+ (4.10.4-ph+-8) vivid; urgency=low
+ .
+   * Custom built Linux kernel.
+Checksums-Sha1:
+ ae0eaa5a95828a8c06c345c2fa4d9933469e2b4c 1174 linux-4.10.4-ph+_4.10.4-ph+-8.dsc
+ 0159a8d2ba5e352a158311c46c12b50d7b8001d9 305171437 linux-4.10.4-ph+_4.10.4-ph+.orig.tar.gz
+ 46b9b30ca979771904ed111cf1ea49fa3a1ea449 1289 linux-4.10.4-ph+_4.10.4-ph+-8.debian.tar.gz
+ 02d95e112c2ccc78433f91a716ab2895386072ae 736478 linux-firmware-image-4.10.4-ph+_4.10.4-ph+-8_amd64.deb
+ 28c0e1da666ae352c0045a3ff6661238e7d0fe46 10539370 linux-headers-4.10.4-ph+_4.10.4-ph+-8_amd64.deb
+ b66de08a2bb92152bdff1c0b54cd24796302ac7b 18284858 linux-image-4.10.4-ph+_4.10.4-ph+-8_amd64.deb
+ a492d9ede82293092ae2dcf9824c989e92a7e1e8 893162 linux-libc-dev_4.10.4-ph+-8_amd64.deb
+Checksums-Sha256:
+ eec2ca76636d1d2247d7a955493d7721b4c47fb6788ed514084de26ac81a03f9 1174 linux-4.10.4-ph+_4.10.4-ph+-8.dsc
+ 9a3a1037ed0e808b77c135197e7798303d55145cdc9fe2fe91aba5804cf6fb44 305171437 linux-4.10.4-ph+_4.10.4-ph+.orig.tar.gz
+ 4f07681d57c6c5c7f682d7f55791cfbeee4bfbfc360f324f2e0e4c79fe70b706 1289 linux-4.10.4-ph+_4.10.4-ph+-8.debian.tar.gz
+ 394b38701a7a186de2ac9802592c644220265722881aad161d8ded355a52fadc 736478 linux-firmware-image-4.10.4-ph+_4.10.4-ph+-8_amd64.deb
+ 343daecc6db20ec4a524629f373f0f1d9c2907120464f2f24245262bcdc8b3ae 10539370 linux-headers-4.10.4-ph+_4.10.4-ph+-8_amd64.deb
+ 8490779ef350b88d568ea07963054d058752d8c4f11e9e9be95c30a4dcbe8ed5 18284858 linux-image-4.10.4-ph+_4.10.4-ph+-8_amd64.deb
+ efe86b67181ec8c9fc16a841e3c0ca02194755c654b13423a99562848d4ca8be 893162 linux-libc-dev_4.10.4-ph+-8_amd64.deb
+Files:
+ e9ea2b92b34f5297d53eaf3f12062e34 1174 kernel optional linux-4.10.4-ph+_4.10.4-ph+-8.dsc
+ 7ff8af116b6af6bdb442eed0a53bb882 305171437 kernel optional linux-4.10.4-ph+_4.10.4-ph+.orig.tar.gz
+ 8db86fcea019c3c2e37f4c3bf2b85f66 1289 kernel optional linux-4.10.4-ph+_4.10.4-ph+-8.debian.tar.gz
+ 24b6ad502ffac0e9f9c051722d217630 736478 kernel optional linux-firmware-image-4.10.4-ph+_4.10.4-ph+-8_amd64.deb
+ a3938a367de5bfdd09d01b3a7106c967 10539370 kernel optional linux-headers-4.10.4-ph+_4.10.4-ph+-8_amd64.deb
+ 0ae23f85b454ecf021994ec6db017240 18284858 kernel optional linux-image-4.10.4-ph+_4.10.4-ph+-8_amd64.deb
+ d5d63112452358fa0a1c4facd85987af 893162 devel optional linux-libc-dev_4.10.4-ph+-8_amd64.deb
diff --git a/build/linux/Makefile b/build/linux/Makefile
@@ -1,6 +1,6 @@
 VERSION = 4
 PATCHLEVEL = 10
-SUBLEVEL = 3
+SUBLEVEL = 4
 EXTRAVERSION =
 NAME = Fearless Coyote
 

diff --git a/build/linux/arch/arm/configs/qcom_defconfig b/build/linux/arch/arm/configs/qcom_defconfig
@@ -157,6 +157,8 @@ CONFIG_DMADEVICES=y
 CONFIG_QCOM_BAM_DMA=y
 CONFIG_STAGING=y
 CONFIG_COMMON_CLK_QCOM=y
+CONFIG_QCOM_CLK_RPM=y
+CONFIG_QCOM_CLK_SMD_RPM=y
 CONFIG_APQ_MMCC_8084=y
 CONFIG_IPQ_LCC_806X=y
 CONFIG_MSM_GCC_8660=y

diff --git a/build/linux/arch/mips/configs/ip22_defconfig b/build/linux/arch/mips/configs/ip22_defconfig
@@ -67,8 +67,8 @@ CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m

diff --git a/build/linux/arch/mips/configs/ip27_defconfig b/build/linux/arch/mips/configs/ip27_defconfig
@@ -133,7 +133,7 @@ CONFIG_LIBFC=m
 CONFIG_SCSI_QLOGIC_1280=y
 CONFIG_SCSI_PMCRAID=m
 CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_DH=m
+CONFIG_SCSI_DH=y
 CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
 CONFIG_SCSI_DH_EMC=m
@@ -205,7 +205,6 @@ CONFIG_MLX4_EN=m
 # CONFIG_MLX4_DEBUG is not set
 CONFIG_TEHUTI=m
 CONFIG_BNX2X=m
-CONFIG_QLGE=m
 CONFIG_SFC=m
 CONFIG_BE2NET=m
 CONFIG_LIBERTAS_THINFIRM=m

diff --git a/build/linux/arch/mips/configs/lemote2f_defconfig b/build/linux/arch/mips/configs/lemote2f_defconfig
@@ -39,7 +39,7 @@ CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION="/dev/hda3"
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEBUG=y
-CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m

diff --git a/build/linux/arch/mips/configs/malta_defconfig b/build/linux/arch/mips/configs/malta_defconfig
@@ -59,8 +59,8 @@ CONFIG_NETFILTER=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m

diff --git a/build/linux/arch/mips/configs/malta_kvm_defconfig b/build/linux/arch/mips/configs/malta_kvm_defconfig
@@ -60,8 +60,8 @@ CONFIG_NETFILTER=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m

diff --git a/build/linux/arch/mips/configs/malta_kvm_guest_defconfig b/build/linux/arch/mips/configs/malta_kvm_guest_defconfig
@@ -59,8 +59,8 @@ CONFIG_NETFILTER=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m

diff --git a/build/linux/arch/mips/configs/maltaup_xpa_defconfig b/build/linux/arch/mips/configs/maltaup_xpa_defconfig
@@ -61,8 +61,8 @@ CONFIG_NETFILTER=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m

diff --git a/build/linux/arch/mips/configs/nlm_xlp_defconfig b/build/linux/arch/mips/configs/nlm_xlp_defconfig
@@ -110,7 +110,7 @@ CONFIG_NETFILTER=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CT_PROTO_UDPLITE=y
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m

diff --git a/build/linux/arch/mips/configs/nlm_xlr_defconfig b/build/linux/arch/mips/configs/nlm_xlr_defconfig
@@ -90,7 +90,7 @@ CONFIG_NETFILTER=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CT_PROTO_UDPLITE=y
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m

diff --git a/build/linux/arch/mips/include/asm/mach-ip27/spaces.h b/build/linux/arch/mips/include/asm/mach-ip27/spaces.h
@@ -12,14 +12,16 @@
 
 /*
  * IP27 uses the R10000's uncached attribute feature.  Attribute 3 selects
- * uncached memory addressing.
+ * uncached memory addressing. Hide the definitions on 32-bit compilation
+ * of the compat-vdso code.
  */
-
+#ifdef CONFIG_64BIT
 #define HSPEC_BASE		0x9000000000000000
 #define IO_BASE			0x9200000000000000
 #define MSPEC_BASE		0x9400000000000000
 #define UNCAC_BASE		0x9600000000000000
 #define CAC_BASE		0xa800000000000000
+#endif
 
 #define TO_MSPEC(x)		(MSPEC_BASE | ((x) & TO_PHYS_MASK))
 #define TO_HSPEC(x)		(HSPEC_BASE | ((x) & TO_PHYS_MASK))

diff --git a/build/linux/arch/mips/ralink/prom.c b/build/linux/arch/mips/ralink/prom.c
@@ -30,8 +30,10 @@ const char *get_system_type(void)
 	return soc_info.sys_type;
 }
 
-static __init void prom_init_cmdline(int argc, char **argv)
+static __init void prom_init_cmdline(void)
 {
+	int argc;
+	char **argv;
 	int i;
 
 	pr_debug("prom: fw_arg0=%08x fw_arg1=%08x fw_arg2=%08x fw_arg3=%08x\n",
@@ -60,14 +62,11 @@ static __init void prom_init_cmdline(int argc, char **argv)
 
 void __init prom_init(void)
 {
-	int argc;
-	char **argv;
-
 	prom_soc_init(&soc_info);
 
 	pr_info("SoC Type: %s\n", get_system_type());
 
-	prom_init_cmdline(argc, argv);
+	prom_init_cmdline();
 }
 
 void __init prom_free_prom_memory(void)

diff --git a/build/linux/arch/mips/ralink/rt288x.c b/build/linux/arch/mips/ralink/rt288x.c
@@ -40,16 +40,6 @@ static struct rt2880_pmx_group rt2880_pinmux_data_act[] = {
 	{ 0 }
 };
 
-static void rt288x_wdt_reset(void)
-{
-	u32 t;
-
-	/* enable WDT reset output on pin SRAM_CS_N */
-	t = rt_sysc_r32(SYSC_REG_CLKCFG);
-	t |= CLKCFG_SRAM_CS_N_WDT;
-	rt_sysc_w32(t, SYSC_REG_CLKCFG);
-}
-
 void __init ralink_clk_init(void)
 {
 	unsigned long cpu_rate, wmac_rate = 40000000;

diff --git a/build/linux/arch/mips/ralink/rt305x.c b/build/linux/arch/mips/ralink/rt305x.c
@@ -89,17 +89,6 @@ static struct rt2880_pmx_group rt5350_pinmux_data[] = {
 	{ 0 }
 };
 
-static void rt305x_wdt_reset(void)
-{
-	u32 t;
-
-	/* enable WDT reset output on pin SRAM_CS_N */
-	t = rt_sysc_r32(SYSC_REG_SYSTEM_CONFIG);
-	t |= RT305X_SYSCFG_SRAM_CS0_MODE_WDT <<
-		RT305X_SYSCFG_SRAM_CS0_MODE_SHIFT;
-	rt_sysc_w32(t, SYSC_REG_SYSTEM_CONFIG);
-}
-
 static unsigned long rt5350_get_mem_size(void)
 {
 	void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT305X_SYSC_BASE);

diff --git a/build/linux/arch/mips/ralink/rt3883.c b/build/linux/arch/mips/ralink/rt3883.c
@@ -63,16 +63,6 @@ static struct rt2880_pmx_group rt3883_pinmux_data[] = {
 	{ 0 }
 };
 
-static void rt3883_wdt_reset(void)
-{
-	u32 t;
-
-	/* enable WDT reset output on GPIO 2 */
-	t = rt_sysc_r32(RT3883_SYSC_REG_SYSCFG1);
-	t |= RT3883_SYSCFG1_GPIO2_AS_WDT_OUT;
-	rt_sysc_w32(t, RT3883_SYSC_REG_SYSCFG1);
-}
-
 void __init ralink_clk_init(void)
 {
 	unsigned long cpu_rate, sys_rate;

diff --git a/build/linux/arch/mips/ralink/timer.c b/build/linux/arch/mips/ralink/timer.c
@@ -71,11 +71,6 @@ static int rt_timer_request(struct rt_timer *rt)
 	return err;
 }
 
-static void rt_timer_free(struct rt_timer *rt)
-{
-	free_irq(rt->irq, rt);
-}
-
 static int rt_timer_config(struct rt_timer *rt, unsigned long divisor)
 {
 	if (rt->timer_freq < divisor)
@@ -101,15 +96,6 @@ static int rt_timer_enable(struct rt_timer *rt)
 	return 0;
 }
 
-static void rt_timer_disable(struct rt_timer *rt)
-{
-	u32 t;
-
-	t = rt_timer_r32(rt, TIMER_REG_TMR0CTL);
-	t &= ~TMR0CTL_ENABLE;
-	rt_timer_w32(rt, TIMER_REG_TMR0CTL, t);
-}
-
 static int rt_timer_probe(struct platform_device *pdev)
 {
 	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

diff --git a/build/linux/arch/mips/sgi-ip22/Platform b/build/linux/arch/mips/sgi-ip22/Platform
@@ -25,7 +25,7 @@ endif
 # Simplified: what IP22 does at 128MB+ in ksegN, IP28 does at 512MB+ in xkphys
 #
 ifdef CONFIG_SGI_IP28
-  ifeq ($(call cc-option-yn,-mr10k-cache-barrier=store), n)
+  ifeq ($(call cc-option-yn,-march=r10000 -mr10k-cache-barrier=store), n)
       $(error gcc doesn't support needed option -mr10k-cache-barrier=store)
   endif
 endif

diff --git a/build/linux/arch/powerpc/include/asm/nohash/pgtable.h b/build/linux/arch/powerpc/include/asm/nohash/pgtable.h
@@ -230,7 +230,7 @@ static inline int hugepd_ok(hugepd_t hpd)
 	return ((hpd_val(hpd) & 0x4) != 0);
 #else
 	/* We clear the top bit to indicate hugepd */
-	return ((hpd_val(hpd) & PD_HUGE) ==  0);
+	return (hpd_val(hpd) && (hpd_val(hpd) & PD_HUGE) == 0);
 #endif
 }