Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
d6b444ca
Commit
d6b444ca
authored
Jun 25, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://kernel.bkbits.net/davem/sparc-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
parents
012af0b9
47a55c50
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
arch/sparc/Makefile
arch/sparc/Makefile
+3
-1
include/asm-sparc/bug.h
include/asm-sparc/bug.h
+7
-2
No files found.
arch/sparc/Makefile
View file @
d6b444ca
...
...
@@ -52,7 +52,9 @@ CORE_Y += kernel/ mm/ fs/ ipc/ security/ crypto/
CORE_Y
:=
$(
patsubst
%/, %/built-in.o,
$(CORE_Y)
)
DRIVERS_Y
:=
$(
patsubst
%/, %/built-in.o,
$
(
drivers-y
))
NET_Y
:=
$(
patsubst
%/, %/built-in.o,
$
(
net-y
))
LIBS_Y
:=
$(
patsubst
%/, %/lib.a,
$
(
libs-y
))
LIBS_Y1
:=
$(
patsubst
%/, %/lib.a,
$
(
libs-y
))
LIBS_Y2
:=
$(
patsubst
%/, %/built-in.o,
$
(
libs-y
))
LIBS_Y
:=
$(LIBS_Y1)
$(LIBS_Y2)
export
INIT_Y
CORE_Y
DRIVERS_Y
NET_Y
LIBS_Y
HEAD_Y
# Default target
...
...
include/asm-sparc/bug.h
View file @
d6b444ca
...
...
@@ -2,14 +2,19 @@
#ifndef _SPARC_BUG_H
#define _SPARC_BUG_H
/* Only use the inline asm until a gcc release that can handle __builtin_trap
* -rob 2003-06-25 */
#define __bug_trap() \
__asm__ __volatile__ ("t 0x5\n\t" : : )
#ifdef CONFIG_DEBUG_BUGVERBOSE
extern
void
do_BUG
(
const
char
*
file
,
int
line
);
#define BUG() do { \
do_BUG(__FILE__, __LINE__); \
__bu
iltin
_trap(); \
__bu
g
_trap(); \
} while (0)
#else
#define BUG() __bu
iltin
_trap()
#define BUG() __bu
g
_trap()
#endif
#define BUG_ON(condition) do { \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment