Patchwork : Remove redundant #ifdef CONFIG_SPARC64 check

login
register
mail settings
Submitter Sarah Nadi
Date June 11, 2012, 9:12 p.m.
Message ID <4FD65F3F.3040409@uwaterloo.ca>
Download mbox | patch
Permalink /patch/164254/
State Rejected
Delegated to: David Miller
Headers show

Comments

Sarah Nadi - June 11, 2012, 9:12 p.m.
From: Sarah Nadi<snadi@uwaterloo.ca>

Summary: Unnecessary #ifdef check in arch/sparc/kernel/jump_label.c

Problem description: The #ifdef CONFIG_SPARC64 is unnecessary since the file is only compiled when CONFIG_SPARC64 is selected. Leaving it in makes the
#ifdef block always selected while the #else block is never selected. Suggested patch to remove unneccesary check below.


Patch:



Signed-off-by: Sarah Nadi <snadi@uwaterloo.ca>

--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

--- a/arch/sparc/kernel/jump_label.c    2012-06-11 16:51:15.000000000 -0400
+++ b/arch/sparc/kernel/jump_label.c    2012-06-11 16:54:39.000000000 -0400
@@ -17,13 +17,9 @@ 
      if (type == JUMP_LABEL_ENABLE) {
          s32 off = (s32)entry->target - (s32)entry->code;

-#ifdef CONFIG_SPARC64
          /* ba,pt %xcc, . + (off << 2) */
          val = 0x10680000 | ((u32) off >> 2);
-#else
-        /* ba . + (off << 2) */
-        val = 0x10800000 | ((u32) off >> 2);
-#endif
+
      } else {
          val = 0x01000000;
      }