Changeset 696979ce in mainline for kernel/arch/sparc64/include/context.h

Timestamp:

2010-02-06T10:54:21Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5bda2f96

Parents:

3f93cdbe (diff), 25e963a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from mainline.

File:

• kernel/arch/sparc64/include/context.h (modified) (1 diff)

kernel/arch/sparc64/include/context.h

@@ -42 +42 @@
 #define SP_DELTA        (STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE)
 
-#ifdef context_set
-#undef context_set
-#endif
-
 #define context_set(c, _pc, stack, size)                        \
         (c)->pc = ((uintptr_t) _pc) - 8;                        \