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

Changeset c822026 in mainline


Ignore:
Timestamp:
2009-04-13T21:35:28Z (13 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master
Children:
4ee4046
Parents:
37c312a
Message:

fix compilation in non-SMP configurations

Location:
kernel/generic/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/ddi/irq.c

    r37c312a rc822026  
    352352/** Unlock IRQ structure after hash_table_remove().
    353353 *
    354  * @param lnk           Link in the removed and locked IRQ structure.
     354 * @param lnk Link in the removed and locked IRQ structure.
    355355 */
    356356void irq_ht_remove(link_t *lnk)
    357357{
    358         irq_t *irq = hash_table_get_instance(lnk, irq_t, link);
     358        irq_t *irq __attribute__((unused))
     359            = hash_table_get_instance(lnk, irq_t, link);
    359360        spinlock_unlock(&irq->lock);
    360361}
     
    425426void irq_lin_remove(link_t *lnk)
    426427{
    427         irq_t *irq = hash_table_get_instance(lnk, irq_t, link);
     428        irq_t *irq __attribute__((unused))
     429            = hash_table_get_instance(lnk, irq_t, link);
    428430        spinlock_unlock(&irq->lock);
    429431}
  • kernel/generic/src/ipc/irq.c

    r37c312a rc822026  
    129129/** Register an answerbox as a receiving end for IRQ notifications.
    130130 *
    131  * @param box           Receiving answerbox.
    132  * @param inr           IRQ number.
    133  * @param devno         Device number.
    134  * @param method        Method to be associated with the notification.
    135  * @param ucode         Uspace pointer to top-half pseudocode.
    136  *
    137  * @return              EBADMEM, ENOENT or EEXISTS on failure or 0 on success.
     131 * @param box    Receiving answerbox.
     132 * @param inr    IRQ number.
     133 * @param devno  Device number.
     134 * @param method Method to be associated with the notification.
     135 * @param ucode  Uspace pointer to top-half pseudocode.
     136 *
     137 * @return EBADMEM, ENOENT or EEXISTS on failure or 0 on success.
     138 *
    138139 */
    139140int ipc_irq_register(answerbox_t *box, inr_t inr, devno_t devno,
     
    148149                (unative_t) devno
    149150        };
    150 
     151       
    151152        if (ucode) {
    152153                code = code_from_uspace(ucode);
     
    156157                code = NULL;
    157158        }
    158 
     159       
    159160        /*
    160161         * Allocate and populate the IRQ structure.
     
    171172        irq->notif_cfg.code = code;
    172173        irq->notif_cfg.counter = 0;
    173 
     174       
    174175        /*
    175176         * Enlist the IRQ structure in the uspace IRQ hash table and the
     
    180181        hlp = hash_table_find(&irq_uspace_hash_table, key);
    181182        if (hlp) {
    182                 irq_t *hirq = hash_table_get_instance(hlp, irq_t, link);
     183                irq_t *hirq __attribute__((unused))
     184                    = hash_table_get_instance(hlp, irq_t, link);
     185               
    183186                /* hirq is locked */
    184187                spinlock_unlock(&hirq->lock);
     
    189192                return EEXISTS;
    190193        }
    191         spinlock_lock(&irq->lock);      /* not really necessary, but paranoid */
     194       
     195        spinlock_lock(&irq->lock);  /* Not really necessary, but paranoid */
    192196        spinlock_lock(&box->irq_lock);
    193197        hash_table_insert(&irq_uspace_hash_table, key, &irq->link);
     
    196200        spinlock_unlock(&irq->lock);
    197201        spinlock_unlock(&irq_uspace_hash_table_lock);
    198 
     202       
    199203        interrupts_restore(ipl);
    200204        return EOK;
Note: See TracChangeset for help on using the changeset viewer.