[PATCH 2/3] of/flattree: Make unflatten_device_tree() safe to call from any arch

Grant Likely grant.likely at secretlab.ca
Fri Mar 12 15:55:52 EST 2010


On Thu, Mar 11, 2010 at 4:48 PM, Stephen Rothwell <sfr at canb.auug.org.au> wrote:
> Hi Grant,
>
> On Thu, 11 Mar 2010 10:32:03 -0700 Grant Likely <grant.likely at secretlab.ca> wrote:
>>
>> - If CONFIG_OF_FLATTREE is not set, then make unflatten_device_tree()
>>   an empty #define.
>
> "an empty static inline funtion."
>
>> diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
>> index f0fdd1f..54399f1 100644
>> --- a/include/linux/of_fdt.h
>> +++ b/include/linux/of_fdt.h
>> @@ -99,6 +99,8 @@ extern int early_init_dt_scan_root(unsigned long node, const char *uname,
>>  /* Other Prototypes */
>>  extern void unflatten_device_tree(void);
>>  extern void early_init_devtree(void *);
>> +#else /* CONFIG_OF_FLATTREE */
>> +static inline void define unflatten_device_tree(void) {}
>                      ^^^^^^
> You need to remove that.

Fixed.  Thanks.

g.


More information about the devicetree-discuss mailing list