diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 10:46:18 +0900 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 10:46:18 +0900 |
commit | 54f7fc25e5736c39050454fe6b5a2bed027fbfab (patch) | |
tree | 89b1d6395360c17d03a5c3900cb274932d12791e /arch/tile/include/uapi/asm/signal.h | |
parent | 0c4a479bdf7c0cf3fa1610b25e0c4ddd5b58713e (diff) | |
parent | c19c6c954b9b264abdc21e0c855118e3daf019b0 (diff) | |
download | talos-obmc-linux-54f7fc25e5736c39050454fe6b5a2bed027fbfab.tar.gz talos-obmc-linux-54f7fc25e5736c39050454fe6b5a2bed027fbfab.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull tile arch update from Chris Metcalf:
"The bulk of this change is the tile uapi disintegration. There is
also a one-line change in here to enable interrupts in
do_work_pending() to avoid a WARN_ON in _local_bh_enable_ip()."
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
arch/tile: enable interrupts in do_work_pending()
UAPI: (Scripted) Disintegrate arch/tile/include/asm
UAPI: (Scripted) Disintegrate arch/tile/include/arch
Diffstat (limited to 'arch/tile/include/uapi/asm/signal.h')
-rw-r--r-- | arch/tile/include/uapi/asm/signal.h | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/arch/tile/include/uapi/asm/signal.h b/arch/tile/include/uapi/asm/signal.h new file mode 100644 index 000000000000..ef0d32d84a4c --- /dev/null +++ b/arch/tile/include/uapi/asm/signal.h @@ -0,0 +1,27 @@ +/* + * Copyright 2010 Tilera Corporation. All Rights Reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or + * NON INFRINGEMENT. See the GNU General Public License for + * more details. + */ + +#ifndef _UAPI_ASM_TILE_SIGNAL_H +#define _UAPI_ASM_TILE_SIGNAL_H + +/* Do not notify a ptracer when this signal is handled. */ +#define SA_NOPTRACE 0x02000000u + +/* Used in earlier Tilera releases, so keeping for binary compatibility. */ +#define SA_RESTORER 0x04000000u + +#include <asm-generic/signal.h> + + +#endif /* _UAPI_ASM_TILE_SIGNAL_H */ |