Ignore:
Timestamp:
Aug 21, 2021, 3:35:34 AM (4 years ago)
Author:
David Azarewicz
Message:

Merge changes from next branch.

Location:
GPL/trunk
Files:
6 edited
1 copied

Legend:

Unmodified
Added
Removed
  • GPL/trunk

  • GPL/trunk/include/linux/kmod.h

    r32 r695  
    33#ifndef _LINUX_KMOD_H
    44#define _LINUX_KMOD_H
     5#include <asm/errno.h>
     6static inline int request_module(const char *name, ...) { return -ENOSYS; }
    57
    68#endif /* _LINUX_KMOD_H */
  • GPL/trunk/include/linux/mod_devicetable.h

    r679 r695  
    1212};
    1313
     14#define ACPI_ID_LEN     9
     15
    1416#endif /* _LINUX_MOD_DEVICETABLE_H */
  • GPL/trunk/include/linux/moduleparam.h

    r679 r695  
    6262   ulong, charp, bool or invbool, or XXX if you define param_get_XXX,
    6363   param_set_XXX and param_check_XXX. */
    64 #define module_param_named(name, value, type, perm)                        \
    65         param_check_##type(name, &(value));                                \
    66         module_param_call(name, param_set_##type, param_get_##type, &value, perm)
     64#define module_param_named(name, value, type, perm)
    6765
    6866#ifndef TARGET_OS2
  • GPL/trunk/include/linux/rwsem.h

    r679 r695  
    1414#define up_read(x) up(x)
    1515#define up_write(x) up(x)
     16#define downgrade_write(a)
    1617
    1718static inline int down_write_trylock(struct rw_semaphore *sem) {return 0;}
  • GPL/trunk/include/linux/slab.h

    r679 r695  
    106106}
    107107
     108/**
     109 * krealloc_array - reallocate memory for an array.
     110 * @p: pointer to the memory chunk to reallocate
     111 * @new_n: new number of elements to alloc
     112 * @new_size: new size of a single member of the array
     113 * @flags: the type of memory to allocate (see kmalloc)
     114 */
     115static __must_check inline void *
     116krealloc_array(void *p, size_t new_n, size_t new_size, gfp_t flags)
     117{
     118//      size_t bytes;
     119
     120//      if (check_mul_overflow(new_n, new_size, &bytes))
     121//              return NULL;
     122
     123        return krealloc(p, new_n*new_size, flags);
     124}
     125
    108126#define kmalloc_node_track_caller(size, flags, node) \
    109127        kmalloc_track_caller(size, flags)
Note: See TracChangeset for help on using the changeset viewer.