cvs server: Up-to-date check failed for `src/kernel/core/vm/vm.c'

cvs [server aborted]: correct above errors first!
cvs commit: saving log message in /tmp/cvsFPtfaj


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4344 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/private/kernel/arch/sh4/atomic.h

@@ -23,38 +23,6 @@ extern "C" {
  * match the definitions in SupportDefs.h
  */
 
-/**
- * Perform an atomic addition.
- * @param val Pointer to an integer
- * @param incr The increment to add (may be -ve)
- * @note Returns value of val before addition
- */
-int32 atomic_add(vint32 *val, int32 incr);
-
-/**
- * Atomic and operation
- * @param val Pointer to an integer
- * @param incr The increment to add (may be -ve)
- * @note Returns value of val before addition
- */
-int32 atomic_and(vint32 *val, int32 incr);
-
-/**
- * Atomic or operation
- * @param val Pointer to an integer
- * @param incr The increment to add (may be -ve)
- * @note Returns value of val before addition
- */
-int32 atomic_or(vint32 *val, int32 incr);
-
-int32 atomic_set(vint32 *val, int32 set_to);
-
-/* Compare the value of val with test_val. If they
- * are equal then set the value of 'val' to
- * 'set_to'
- */
-int32 test_and_set(vint32 *val, int32 set_to, int32 test_val);
-
 /**
  * Atomic add (user version)
  * @param val Pointer to an integer
@@ -87,11 +55,11 @@ int32 user_atomic_set(vint32 *val, int32 set_to);
  * @note This is the user version and should not be used within
  *       the kernel.
  */
-int32 user_test_and_set(vint32 *val, int32 set_to, int32 test_val);
+int32 user_atomic_test_and_set(vint32 *val, int32 set_to, int32 test_val);
 
 #ifdef __cplusplus
 }
 #endif 
 /** @} */
 
-#endif /* _KERNEL_ATOMIC_H */
+#endif /* _KERNEL_ATOMIC_H */

src/kernel/core/arch/x86/arch_selector.c

@@ -7,7 +7,6 @@
 #include <arch/cpu.h>
 #include <smp.h>
 #include <int.h>
-#include <atomic.h>
 
 #include <arch/x86/selector.h>
 

src/kernel/core/elf.c

@@ -14,7 +14,6 @@
 #include <thread.h>
 #include <debug.h>
 #include <malloc.h>
-#include <atomic.h>
 #include <stdlib.h>
 
 #include <arch/cpu.h>

src/kernel/core/smp.c

@@ -14,7 +14,6 @@
 #include <smp.h>
 #include <malloc.h>
 #include <Errors.h>
-#include <atomic.h>
 
 #include <cpu.h>
 #include <arch/cpu.h>

src/kernel/core/team.c

@@ -20,7 +20,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <elf.h>
-#include <atomic.h>
 #include <syscalls.h>
 #include <tls.h>
 

src/kernel/core/thread.c

@@ -33,7 +33,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <resource.h>
-#include <atomic.h>
 #include <kerrors.h>
 #include <syscalls.h>
 #include <ksignal.h>

src/kernel/core/vm/vm.c

@@ -24,7 +24,6 @@
 #include <lock.h>
 #include <khash.h>
 #include <thread.h>
-#include <atomic.h>
 
 #include <boot/stage2.h>
 

src/kernel/core/vm/vm_cache.c

@@ -17,7 +17,6 @@
 #include <smp.h>
 #include <arch/cpu.h>
 #include <Errors.h>
-#include <atomic.h>
 
 /* hash table of pages keyed by cache they're in and offset */
 #define PAGE_TABLE_SIZE 1024 /* make this dynamic */

src/kernel/core/vm/vm_daemons.c

@@ -12,7 +12,6 @@
 #include <vm_priv.h>
 #include <vm_cache.h>
 #include <vm_page.h>
-#include <atomic.h>
 
 bool trimming_cycle;
 static addr free_memory_low_water;

src/kernel/libroot/posix/malloc/arch-specific.cpp

@@ -33,7 +33,6 @@ extern "C" {
 
 #include <stdio.h>
 #include <syscalls.h>
-#include <atomic.h>
 
 sem_id create_sem(int32 count, const char *name);
 status_t delete_sem(sem_id id);