---

yaml --- r: 262709 b: refs/heads/master c: c113a3a h: refs/heads/master i: 262707: da61338 v: v3
git-mirror · Aug 5, 2011 · e9fa485 · e9fa485
1 parent 3640d7c
commit e9fa485
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fbafd728151ccc8665584bde78deb03dbb9ef055
+refs/heads/master: c113a3aee2b68e311f2bc55f70fe56b64c3a476b
diff --git a/trunk/arch/powerpc/include/asm/jump_label.h b/trunk/arch/powerpc/include/asm/jump_label.h
@@ -22,7 +22,6 @@ static __always_inline bool arch_static_branch(struct jump_label_key *key)
 	asm goto("1:\n\t"
 		 "nop\n\t"
 		 ".pushsection __jump_table,  \"aw\"\n\t"
-		 ".align 4\n\t"
 		 JUMP_ENTRY_TYPE "1b, %l[l_yes], %c0\n\t"
 		 ".popsection \n\t"
 		 : :  "i" (key) : : l_yes);
@@ -41,7 +40,6 @@ struct jump_entry {
 	jump_label_t code;
 	jump_label_t target;
 	jump_label_t key;
-	jump_label_t pad;
 };
 
 #endif /* _ASM_POWERPC_JUMP_LABEL_H */