Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset af56e9b in mainline


Ignore:
Timestamp:
2010-02-22T19:40:17Z (12 years ago)
Author:
Pavel Rimsky <pavel@…>
Branches:
lfn, master
Children:
f8f7dba
Parents:
95c4776 (diff), 721d4e85 (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:

Synchronize with head.

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/amd64/include/atomic.h

    r95c4776 raf56e9b  
    101101static inline atomic_count_t test_and_set(atomic_t *val)
    102102{
    103         atomic_count_t v;
     103        atomic_count_t v = 1;
    104104       
    105105        asm volatile (
    106                 "movq $1, %[v]\n"
    107106                "xchgq %[v], %[count]\n"
    108                 : [v] "=r" (v),
     107                : [v] "+r" (v),
    109108                  [count] "+m" (val->count)
    110109        );
  • kernel/arch/ia32/include/atomic.h

    r95c4776 raf56e9b  
    101101static inline atomic_count_t test_and_set(atomic_t *val)
    102102{
    103         atomic_count_t v;
     103        atomic_count_t v = 1;
    104104       
    105105        asm volatile (
    106                 "movl $1, %[v]\n"
    107106                "xchgl %[v], %[count]\n"
    108                 : [v] "=r" (v),
     107                : [v] "+r" (v),
    109108                  [count] "+m" (val->count)
    110109        );
  • kernel/generic/src/mm/as.c

    r95c4776 raf56e9b  
    952952        if (!THREAD)
    953953                return AS_PF_FAULT;
    954                
    955         ASSERT(AS);
    956 
     954       
     955        if (!AS)
     956                return AS_PF_FAULT;
     957       
    957958        mutex_lock(&AS->lock);
    958         area = find_area_and_lock(AS, page);   
     959        area = find_area_and_lock(AS, page);
    959960        if (!area) {
    960961                /*
  • kernel/generic/src/proc/scheduler.c

    r95c4776 raf56e9b  
    201201                 * even though there is a runnable thread.
    202202                 */
    203 
    204203                 cpu_sleep();
    205204                 goto loop;
  • uspace/app/tester/fault/fault3.def

    r95c4776 raf56e9b  
    33        "Abort",
    44        &test_fault3,
    5         true
     5        false
    66},
Note: See TracChangeset for help on using the changeset viewer.