iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Metag architecture fixes for v4.9-rc1

Browse Source 
A simple build fix for irqsoff atomics which has started hitting
 meta1_defconfig during the 4.9 merge window.
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJYANBeAAoJEGwLaZPeOHZ6dEIQAL8BVnnSQz8qDH2XVcGBhFVN
 m2MRh6sK+RSJX8KP4WSzU6O4E3JuU7aBCAw6MBb7a16Amha3rMWRJoOwXb9BSkuG
 9JJWYeuVehcXzXw+4suXpxMOeAXFcmn3/MPYDzgYx8acbozt3eYEKHxWNSTysZZj
 95SO8WFrlYZSoo+HKy/G5+iE4IcIsDkfCXLLMeVVwNEbcVOSjbQ+Vx+6oVrXQlIi
 roUOr2Q4z8KTcxkuO+5JS8zp/dsTVZtWtF3Tbur0k/t5ZNikiU4q+gT5Edu1ifYf
 lGYBV2ND8p/SRC2ks+7QsdXyRTCxQ5N8BH/53BQAPwSULjrXCevfkvdB7hELag92
 7S/FMjO7wspBufEXrCAOEKtXe5Wz3c9+cpwvlqX8uauzw74IaQ7IEC81SaN2KJ7J
 2Ce46BrDlirJYYUstJJGKQ2hVT/KeyVGqH38atMPiO9nho5EfOLsp+yPpC1Ue5/v
 JCSeLHd5Ab2/yTmYs8S4jpZnKO40MBEzYimsoe6FCrJVSh0HAAYPeu6jOPpq63Wh
 q+5xU1I4GRocGjDRObAUTOky3k8opDr3cv9KoYUIp16RW9s4pANLenGs8phRcQZM
 Ey1lGUP8Lj2yNUVBeN8eoxZfwEKR6+2c1m9o3DvmYEwZrF/e7kwYlS5UGvMSJYX1
 TxaFhbmKUgUlRRbgOeqv
 =y271
 -----END PGP SIGNATURE-----

Merge tag 'metag-for-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag

Pull metag architecture fix from James Hogan:
 "A simple build fix for irqsoff atomics which has started hitting
  meta1_defconfig during the 4.9 merge window"

* tag 'metag-for-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
  metag: Only define atomic_dec_if_positive conditionally
This commit is contained in:
Linus Torvalds 2016-10-14 11:11:39 -07:00
commit e9f8f48bca
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/metag/include/asm/atomic.h
View File

@ -39,11 +39,10 @@
#define atomic_dec(v) atomic_sub(1, (v)) #define atomic_dec(v) atomic_sub(1, (v))
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
#define atomic_dec_if_positive(v) atomic_sub_if_positive(1, v)
#endif #endif
#define atomic_dec_if_positive(v) atomic_sub_if_positive(1, v)
#include <asm-generic/atomic64.h> #include <asm-generic/atomic64.h>
#endif /* __ASM_METAG_ATOMIC_H */ #endif /* __ASM_METAG_ATOMIC_H */