Diff for /src/sys/dev/acpica5/acpi.c between versions 1.1 and 1.2

version 1.1, 2004/02/21 06:48:08 version 1.2, 2004/05/05 22:19:24
Line 566  acpi_add_child(device_t bus, int order, Line 566  acpi_add_child(device_t bus, int order,
     struct acpi_device  *ad;      struct acpi_device  *ad;
     device_t            child;      device_t            child;
   
    if ((ad = malloc(sizeof(*ad), M_ACPIDEV, M_NOWAIT | M_ZERO)) == NULL)    ad = malloc(sizeof(*ad), M_ACPIDEV, M_INTWAIT | M_ZERO);
        return (NULL); 
   
     resource_list_init(&ad->ad_rl);      resource_list_init(&ad->ad_rl);
           
Line 1294  acpi_AllocBuffer(int size) Line 1293  acpi_AllocBuffer(int size)
 {  {
     ACPI_BUFFER *buf;      ACPI_BUFFER *buf;
   
    if ((buf = malloc(size + sizeof(*buf), M_ACPIDEV, M_NOWAIT)) == NULL)    buf = malloc(size + sizeof(*buf), M_ACPIDEV, M_INTWAIT);
        return (NULL); 
     buf->Length = size;      buf->Length = size;
     buf->Pointer = (void *)(buf + 1);      buf->Pointer = (void *)(buf + 1);
     return (buf);      return (buf);
Line 1999  acpi_register_ioctl(u_long cmd, acpi_ioc Line 1997  acpi_register_ioctl(u_long cmd, acpi_ioc
 {  {
     struct acpi_ioctl_hook      *hp;      struct acpi_ioctl_hook      *hp;
   
    if ((hp = malloc(sizeof(*hp), M_ACPIDEV, M_NOWAIT)) == NULL)    hp = malloc(sizeof(*hp), M_ACPIDEV, M_INTWAIT);
        return (ENOMEM); 
     hp->cmd = cmd;      hp->cmd = cmd;
     hp->fn = fn;      hp->fn = fn;
     hp->arg = arg;      hp->arg = arg;

Removed from v.1.1  
changed lines
  Added in v.1.2